aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/dw_anchors_test.cc3
-rw-r--r--test/dw_border_test.cc1
-rw-r--r--test/dw_example.cc1
-rw-r--r--test/dw_find_test.cc1
-rw-r--r--test/dw_images_scaled.cc1
-rw-r--r--test/dw_images_scaled2.cc1
-rw-r--r--test/dw_images_simple.cc1
-rw-r--r--test/dw_links.cc1
-rw-r--r--test/dw_links2.cc1
-rw-r--r--test/dw_lists.cc1
-rw-r--r--test/dw_resource_test.cc3
-rw-r--r--test/dw_table.cc1
-rw-r--r--test/dw_table_aligned.cc1
-rw-r--r--test/dw_ui_test.cc7
-rw-r--r--test/form.cc14
15 files changed, 27 insertions, 11 deletions
diff --git a/test/dw_anchors_test.cc b/test/dw_anchors_test.cc
index 17a0d699..e5fcdbf2 100644
--- a/test/dw_anchors_test.cc
+++ b/test/dw_anchors_test.cc
@@ -122,6 +122,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
StyleAttrs styleAttrs;
styleAttrs.initValues ();
@@ -156,7 +157,7 @@ int main(int argc, char **argv)
wordStyle->unref ();
headingStyle->unref ();
for (int i = 0; i < 10; i++)
- delete buttonLabel[i];
+ free(buttonLabel[i]);
delete layout;
return errorCode;
diff --git a/test/dw_border_test.cc b/test/dw_border_test.cc
index 453d5a3f..988abc33 100644
--- a/test/dw_border_test.cc
+++ b/test/dw_border_test.cc
@@ -59,6 +59,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
diff --git a/test/dw_example.cc b/test/dw_example.cc
index c83878de..52aa2440 100644
--- a/test/dw_example.cc
+++ b/test/dw_example.cc
@@ -51,6 +51,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = dw::core::style::FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = dw::core::style::FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color =
diff --git a/test/dw_find_test.cc b/test/dw_find_test.cc
index 01032285..e5c79fd3 100644
--- a/test/dw_find_test.cc
+++ b/test/dw_find_test.cc
@@ -99,6 +99,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
StyleAttrs styleAttrs;
styleAttrs.initValues ();
diff --git a/test/dw_images_scaled.cc b/test/dw_images_scaled.cc
index 171930cb..2f8896e6 100644
--- a/test/dw_images_scaled.cc
+++ b/test/dw_images_scaled.cc
@@ -114,6 +114,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
diff --git a/test/dw_images_scaled2.cc b/test/dw_images_scaled2.cc
index 0e897188..b436ec94 100644
--- a/test/dw_images_scaled2.cc
+++ b/test/dw_images_scaled2.cc
@@ -89,6 +89,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
diff --git a/test/dw_images_simple.cc b/test/dw_images_simple.cc
index ec6f6008..8f00f847 100644
--- a/test/dw_images_simple.cc
+++ b/test/dw_images_simple.cc
@@ -113,6 +113,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
diff --git a/test/dw_links.cc b/test/dw_links.cc
index a73e6c46..5622cbd5 100644
--- a/test/dw_links.cc
+++ b/test/dw_links.cc
@@ -93,6 +93,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
diff --git a/test/dw_links2.cc b/test/dw_links2.cc
index bca9a8ac..b8e8c55b 100644
--- a/test/dw_links2.cc
+++ b/test/dw_links2.cc
@@ -122,6 +122,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
diff --git a/test/dw_lists.cc b/test/dw_lists.cc
index 9862f09c..12fa1627 100644
--- a/test/dw_lists.cc
+++ b/test/dw_lists.cc
@@ -55,6 +55,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
diff --git a/test/dw_resource_test.cc b/test/dw_resource_test.cc
index 671d0d10..d19fd633 100644
--- a/test/dw_resource_test.cc
+++ b/test/dw_resource_test.cc
@@ -56,6 +56,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
@@ -72,6 +73,8 @@ int main(int argc, char **argv)
styleAttrs.margin.setVal (0);
styleAttrs.backgroundColor = NULL;
+ widgetStyle = Style::create (layout, &styleAttrs);
+
SelectionResource *res = layout->getResourceFactory()->createListResource
(ListResource::SELECTION_AT_MOST_ONE, 4);
//SelectionResource *res =
diff --git a/test/dw_table.cc b/test/dw_table.cc
index 21a381f7..75842e60 100644
--- a/test/dw_table.cc
+++ b/test/dw_table.cc
@@ -63,6 +63,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
Style *tableStyle = Style::create (layout, &styleAttrs);
diff --git a/test/dw_table_aligned.cc b/test/dw_table_aligned.cc
index 0f4441a9..022e7026 100644
--- a/test/dw_table_aligned.cc
+++ b/test/dw_table_aligned.cc
@@ -58,6 +58,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color = Color::create (layout, 0x000000);
diff --git a/test/dw_ui_test.cc b/test/dw_ui_test.cc
index dee2809d..60893f06 100644
--- a/test/dw_ui_test.cc
+++ b/test/dw_ui_test.cc
@@ -62,6 +62,7 @@ int main(int argc, char **argv)
fontAttrs.weight = 400;
fontAttrs.style = FONT_STYLE_NORMAL;
fontAttrs.letterSpacing = 0;
+ fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
Style *tableStyle = Style::create (layout, &styleAttrs);
@@ -120,7 +121,7 @@ int main(int argc, char **argv)
const char *radiovalues[] = { "radio1", "radio2", NULL };
form->addRadioButtonResource ("val3", radiores1, radiovalues);
form->addCheckButtonResource ("check", checkres);
- const char *selvalues[] = { "i1", "i11", "i12", "i13", "i2",
+ const char *selvalues[] = { "i1", "g1", "i11", "i12", "i13", "i2", "g2",
"i21", "i22", "i23", "i3", NULL };
form->addSelectionResource ("val4", selres[0], selvalues);
form->addSelectionResource ("val5", selres[1], selvalues);
@@ -208,9 +209,9 @@ int main(int argc, char **argv)
selres[i]->addItem("item 1/3", false, false);
selres[i]->popGroup();
- selres[i]->addItem("item 2", true, i == 1);
+ selres[i]->addItem("item 2", false, i == 1);
- selres[i]->pushGroup("group 2", false);
+ selres[i]->pushGroup("group 2", true);
selres[i]->addItem("item 2/1", true, false);
selres[i]->addItem("item 2/2", true, false);
selres[i]->addItem("item 2/3", false, false);
diff --git a/test/form.cc b/test/form.cc
index 4bebd520..82938a16 100644
--- a/test/form.cc
+++ b/test/form.cc
@@ -32,7 +32,7 @@ Form::ResourceDecorator::ResourceDecorator (const char *name)
Form::ResourceDecorator::~ResourceDecorator ()
{
- delete name;
+ free((char *)name);
}
Form::TextResourceDecorator::TextResourceDecorator (const char *name,
@@ -57,15 +57,15 @@ Form::RadioButtonResourceDecorator::RadioButtonResourceDecorator
while (values[n])
n++;
this->values = new const char*[n + 1];
- for(int i = 0; i < n; i++)
+ for (int i = 0; i < n; i++)
this->values[i] = strdup (values[i]);
this->values[n] = 0;
}
Form::RadioButtonResourceDecorator::~RadioButtonResourceDecorator ()
{
- for(int i = 0; values[i]; i++)
- delete values[i];
+ for (int i = 0; values[i]; i++)
+ free((char *)values[i]);
delete[] values;
}
@@ -115,7 +115,7 @@ Form::SelectionResourceDecorator::SelectionResourceDecorator
Form::SelectionResourceDecorator::~SelectionResourceDecorator ()
{
for(int i = 0; values[i]; i++)
- delete values[i];
+ free((char *)values[i]);
delete[] values;
}
@@ -159,8 +159,8 @@ Form::FormClickedReceiver::FormClickedReceiver (Form *form, const char *name,
Form::FormClickedReceiver::~FormClickedReceiver ()
{
- delete name;
- delete[] value;
+ free((char *)name);
+ free((char *)value);
}
void Form::FormClickedReceiver::clicked (Resource *resource,