From f95dc4d620ab1da4336df246efdce5224465f3f4 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 24 Jun 2008 12:56:25 +0000 Subject: [PATCH] Compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/treectrl/state1.xpm | 2 +- samples/treectrl/state2.xpm | 2 +- samples/treectrl/state3.xpm | 2 +- samples/treectrl/state4.xpm | 2 +- samples/treectrl/state5.xpm | 2 +- samples/treectrl/treetest.cpp | 6 ++++++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/samples/treectrl/state1.xpm b/samples/treectrl/state1.xpm index 2568d711d1..53be2df34d 100644 --- 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 0eea6c30cd..4987d8c0e5 100644 --- 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 ababed456d..b9c136d27d 100644 --- 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 341b44b958..4c7d892e74 100644 --- 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 01e2722a0e..0c069ee71f 100644 --- 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 5a8ce56f19..b3ba5a751d 100644 --- 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 -- 2.45.2