Compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/treectrl/state1.xpm b/samples/treectrl/state1.xpm
index 2568d711d1a652c77a3f930c5952160e2529961d..53be2df34da6c5f931b8fb77f97b19706ae5c7be 100644 (file)
--- a/samples/treectrl/state1.xpm
+++ b/samples/treectrl/state1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *state1_xpm[] = {
+static const char *state1_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 123 2",
 "8. c #ADAF01",

diff --git a/samples/treectrl/state2.xpm b/samples/treectrl/state2.xpm
index 0eea6c30cd16738cb3c7a21fc648e890729d6795..4987d8c0e52032cd541db2973cd684c1d2a8061d 100644 (file)
--- a/samples/treectrl/state2.xpm
+++ b/samples/treectrl/state2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *state2_xpm[] = {
+static const char *state2_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 122 2",
 "4. c #54AF2C",

diff --git a/samples/treectrl/state3.xpm b/samples/treectrl/state3.xpm
index ababed456d9d57b3bc25047b0211d3e8a73046eb..b9c136d27d92b137c5b1e12e3f3406c78a93ab5f 100644 (file)
--- a/samples/treectrl/state3.xpm
+++ b/samples/treectrl/state3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *state3_xpm[] = {
+static const char *state3_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 120 2",
 "7  c #E48D8D",

diff --git a/samples/treectrl/state4.xpm b/samples/treectrl/state4.xpm
index 341b44b9585f663485cfcbd7ad9c93a51f5ed758..4c7d892e741514a74dae379cde5fe660f305ac8c 100644 (file)
--- a/samples/treectrl/state4.xpm
+++ b/samples/treectrl/state4.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *state4_xpm[] = {
+static const char *state4_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 123 2",
 "h  c #3875C8",

diff --git a/samples/treectrl/state5.xpm b/samples/treectrl/state5.xpm
index 01e2722a0edcde7309a32190692421647507009a..0c069ee71fc7d2d7d4d5a375301faaf034769896 100644 (file)
--- a/samples/treectrl/state5.xpm
+++ b/samples/treectrl/state5.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *state5_xpm[] = {
+static const char *state5_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 63 1",
 ", c Black",

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 5a8ce56f19f5af6b8d9cbf5053d1d0d71241d653..b3ba5a751ddd5b190476062a2fe1ab88b0a8d341 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -916,8 +916,13 @@ void MyTreeCtrl::CreateStateImageList(bool del)
     }
     else
     {
+#if 0
         int width  = ::GetSystemMetrics(SM_CXMENUCHECK),
             height = ::GetSystemMetrics(SM_CYMENUCHECK);
+#else
+        int width = 16;
+        int height = 16;
+#endif
 
         // make an state checkbox image list
         states = new wxImageList(width, height, true);
@@ -931,6 +936,7 @@ void MyTreeCtrl::CreateStateImageList(bool del)
         {
             // first create bitmap in a memory DC
             wxMemoryDC memDC(checkBmp);
+            memDC.Clear();
             // then draw a check mark into it
             renderer.DrawCheckBox(this, memDC, rect, 0);
         } // select checkBmp out of memDC