aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/dw_anchors_test.cc4
-rw-r--r--test/dw_border_test.cc10
-rw-r--r--test/dw_example.cc4
-rw-r--r--test/dw_find_test.cc4
-rw-r--r--test/dw_images_scaled.cc4
-rw-r--r--test/dw_images_scaled2.cc6
-rw-r--r--test/dw_images_simple.cc4
-rw-r--r--test/dw_links.cc6
-rw-r--r--test/dw_links2.cc6
-rw-r--r--test/dw_lists.cc8
-rw-r--r--test/dw_resource_test.cc4
-rw-r--r--test/dw_table.cc6
-rw-r--r--test/dw_table_aligned.cc6
-rw-r--r--test/dw_ui_test.cc4
14 files changed, 38 insertions, 38 deletions
diff --git a/test/dw_anchors_test.cc b/test/dw_anchors_test.cc
index 8615439e..97ed3fb4 100644
--- a/test/dw_anchors_test.cc
+++ b/test/dw_anchors_test.cc
@@ -126,8 +126,8 @@ int main(int argc, char **argv)
styleAttrs.initValues ();
styleAttrs.font = Font::create (layout, &fontAttrs);
styleAttrs.margin.setVal (5);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
topWidgetStyle = Style::create (layout, &styleAttrs);
styleAttrs.margin.left = 20;
diff --git a/test/dw_border_test.cc b/test/dw_border_test.cc
index 0c2b7783..f45c1a07 100644
--- a/test/dw_border_test.cc
+++ b/test/dw_border_test.cc
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
styleAttrs.initValues ();
styleAttrs.margin.setVal (5);
styleAttrs.borderWidth.setVal (2);
- styleAttrs.setBorderColor (Color::createShaded (layout, 0xffffff));
+ styleAttrs.setBorderColor (Color::create (layout, 0xffffff));
styleAttrs.setBorderStyle (BORDER_INSET);
styleAttrs.padding.setVal (5);
@@ -60,15 +60,15 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *widgetStyle1 = Style::create (layout, &styleAttrs);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffff80);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffff80);
styleAttrs.margin.setVal (0);
styleAttrs.borderWidth.setVal (1);
- styleAttrs.setBorderColor (Color::createSimple (layout, 0x4040ff));
+ styleAttrs.setBorderColor (Color::create (layout, 0x4040ff));
styleAttrs.setBorderStyle (BORDER_SOLID);
styleAttrs.padding.setVal (1);
diff --git a/test/dw_example.cc b/test/dw_example.cc
index 75b891e2..ad570924 100644
--- a/test/dw_example.cc
+++ b/test/dw_example.cc
@@ -53,9 +53,9 @@ int main(int argc, char **argv)
styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
styleAttrs.color =
- dw::core::style::Color::createSimple (layout, 0x000000);
+ dw::core::style::Color::create (layout, 0x000000);
styleAttrs.backgroundColor =
- dw::core::style::Color::createSimple (layout, 0xffffff);
+ dw::core::style::Color::create (layout, 0xffffff);
dw::core::style::Style *widgetStyle =
dw::core::style::Style::create (layout, &styleAttrs);
diff --git a/test/dw_find_test.cc b/test/dw_find_test.cc
index a43b4e59..651ca653 100644
--- a/test/dw_find_test.cc
+++ b/test/dw_find_test.cc
@@ -99,8 +99,8 @@ int main(int argc, char **argv)
styleAttrs.initValues ();
styleAttrs.font = Font::create (layout, &fontAttrs);
styleAttrs.margin.setVal (10);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *topWidgetStyle = Style::create (layout, &styleAttrs);
styleAttrs.margin.setVal (0);
diff --git a/test/dw_images_scaled.cc b/test/dw_images_scaled.cc
index dfaf57b9..da53a6fd 100644
--- a/test/dw_images_scaled.cc
+++ b/test/dw_images_scaled.cc
@@ -115,8 +115,8 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *widgetStyle = Style::create (layout, &styleAttrs);
diff --git a/test/dw_images_scaled2.cc b/test/dw_images_scaled2.cc
index 39c55046..aea724f0 100644
--- a/test/dw_images_scaled2.cc
+++ b/test/dw_images_scaled2.cc
@@ -90,8 +90,8 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *widgetStyle = Style::create (layout, &styleAttrs);
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
Style *wordStyle = Style::create (layout, &styleAttrs);
styleAttrs.borderWidth.setVal (1);
- styleAttrs.setBorderColor (Color::createShaded (layout, 0x000080));
+ styleAttrs.setBorderColor (Color::create (layout, 0x000080));
styleAttrs.setBorderStyle (BORDER_SOLID);
styleAttrs.padding.setVal (1);
styleAttrs.backgroundColor = NULL;
diff --git a/test/dw_images_simple.cc b/test/dw_images_simple.cc
index 78629d55..62f25cf7 100644
--- a/test/dw_images_simple.cc
+++ b/test/dw_images_simple.cc
@@ -113,8 +113,8 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *widgetStyle = Style::create (layout, &styleAttrs);
diff --git a/test/dw_links.cc b/test/dw_links.cc
index 4d15d520..08428e88 100644
--- a/test/dw_links.cc
+++ b/test/dw_links.cc
@@ -91,8 +91,8 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *widgetStyle = Style::create (layout, &styleAttrs);
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
Style *wordStyle = Style::create (layout, &styleAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x0000ff);
+ styleAttrs.color = Color::create (layout, 0x0000ff);
styleAttrs.textDecoration = TEXT_DECORATION_UNDERLINE;
styleAttrs.cursor = CURSOR_POINTER;
diff --git a/test/dw_links2.cc b/test/dw_links2.cc
index e1db9011..ea2d4d40 100644
--- a/test/dw_links2.cc
+++ b/test/dw_links2.cc
@@ -119,8 +119,8 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *widgetStyle = Style::create (layout, &styleAttrs);
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
Style *wordStyle = Style::create (layout, &styleAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x0000ff);
+ styleAttrs.color = Color::create (layout, 0x0000ff);
styleAttrs.textDecoration = TEXT_DECORATION_UNDERLINE;
styleAttrs.cursor = CURSOR_POINTER;
diff --git a/test/dw_lists.cc b/test/dw_lists.cc
index 99e78149..2d546f63 100644
--- a/test/dw_lists.cc
+++ b/test/dw_lists.cc
@@ -56,8 +56,8 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *widgetStyle = Style::create (layout, &styleAttrs);
@@ -75,8 +75,8 @@ int main(int argc, char **argv)
styleAttrs.margin.setVal (5);
styleAttrs.padding.setVal (5);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffff40);
- styleAttrs.setBorderColor (Color::createSimple (layout, 0x000000));
+ styleAttrs.backgroundColor = Color::create (layout, 0xffff40);
+ styleAttrs.setBorderColor (Color::create (layout, 0x000000));
styleAttrs.setBorderStyle (BORDER_SOLID);
styleAttrs.borderWidth.setVal (1);
diff --git a/test/dw_resource_test.cc b/test/dw_resource_test.cc
index fc825836..2c90d3ce 100644
--- a/test/dw_resource_test.cc
+++ b/test/dw_resource_test.cc
@@ -57,8 +57,8 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
Style *widgetStyle = Style::create (layout, &styleAttrs);
diff --git a/test/dw_table.cc b/test/dw_table.cc
index d269d551..87ed8360 100644
--- a/test/dw_table.cc
+++ b/test/dw_table.cc
@@ -51,9 +51,9 @@ int main(int argc, char **argv)
styleAttrs.padding.setVal (0);
styleAttrs.borderWidth.setVal (1);
styleAttrs.setBorderStyle (BORDER_OUTSET);
- styleAttrs.setBorderColor (Color::createShaded (layout, 0xffffff));
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.setBorderColor (Color::create (layout, 0xffffff));
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
styleAttrs.hBorderSpacing = 5;
styleAttrs.vBorderSpacing = 5;
diff --git a/test/dw_table_aligned.cc b/test/dw_table_aligned.cc
index beb8525d..5fa94874 100644
--- a/test/dw_table_aligned.cc
+++ b/test/dw_table_aligned.cc
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
styleAttrs.margin.setVal (5);
styleAttrs.borderWidth.setVal (1);
styleAttrs.setBorderStyle (BORDER_OUTSET);
- styleAttrs.setBorderColor (Color::createShaded (layout, 0x808080));
+ styleAttrs.setBorderColor (Color::create (layout, 0x808080));
FontAttrs fontAttrs;
fontAttrs.name = "Bitstream Charter";
@@ -59,8 +59,8 @@ int main(int argc, char **argv)
fontAttrs.style = FONT_STYLE_NORMAL;
styleAttrs.font = Font::create (layout, &fontAttrs);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xa0a0a0);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xa0a0a0);
styleAttrs.hBorderSpacing = 5;
styleAttrs.vBorderSpacing = 5;
diff --git a/test/dw_ui_test.cc b/test/dw_ui_test.cc
index 3815a868..88595a76 100644
--- a/test/dw_ui_test.cc
+++ b/test/dw_ui_test.cc
@@ -53,8 +53,8 @@ int main(int argc, char **argv)
StyleAttrs styleAttrs;
styleAttrs.initValues ();
styleAttrs.margin.setVal (5);
- styleAttrs.color = Color::createSimple (layout, 0x000000);
- styleAttrs.backgroundColor = Color::createSimple (layout, 0xffffff);
+ styleAttrs.color = Color::create (layout, 0x000000);
+ styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
FontAttrs fontAttrs;
fontAttrs.name = "Helvetica";