Compilation

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

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",

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",

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",

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",

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",

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