From bd63bb49e34b880c8654a58f7d2d3690e237e85a Mon Sep 17 00:00:00 2001 From: Tim S Date: Sun, 7 May 2017 23:09:30 -0400 Subject: [PATCH 1/2] Changed value of resource macros; under Win32 when wxUSE_WXDIB=0. wxICON wxBITMAP wxBITMAP_PNG --- include/wx/gdicmn.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 35f680adea..14b648b092 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -183,7 +183,7 @@ enum wxEllipsizeMode // macros // --------------------------------------------------------------------------- -#if defined(__WINDOWS__) +#if defined(__WINDOWS__) && wxUSE_WXDIB #define wxHAS_IMAGES_IN_RESOURCES #endif @@ -197,7 +197,7 @@ enum wxEllipsizeMode wxIcon *icon = new wxIcon(sample_xpm); // On wxGTK/Linux */ -#ifdef __WINDOWS__ +#ifdef wxHAS_IMAGES_IN_RESOURCES // Load from a resource #define wxICON(X) wxIcon(wxT(#X)) #elif defined(__WXDFB__) @@ -227,7 +227,7 @@ enum wxEllipsizeMode under Unix bitmaps live in XPMs and under Windows they're in ressources. */ -#if defined(__WINDOWS__) +#if defined(__WINDOWS__) && wxUSE_WXDIB #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE) #elif defined(__WXGTK__) || \ defined(__WXMOTIF__) || \ @@ -256,7 +256,7 @@ enum wxEllipsizeMode // resource type and under OS X the PNG file with the specified name must be // available in the resource subdirectory of the bundle. Elsewhere, this is // exactly the same thing as wxBITMAP_PNG_FROM_DATA() described above. -#if defined(__WINDOWS__) || defined(__WXOSX__) +#if (defined(__WINDOWS__) && wxUSE_WXDIB) || defined(__WXOSX__) #define wxBITMAP_PNG(name) wxBitmap(wxS(#name), wxBITMAP_TYPE_PNG_RESOURCE) #else #define wxBITMAP_PNG(name) wxBITMAP_PNG_FROM_DATA(name) From 2d0ac3d0270b09c60a0b9502e4bdd5ad17481007 Mon Sep 17 00:00:00 2001 From: Tim S Date: Mon, 8 May 2017 09:45:08 -0400 Subject: [PATCH 2/2] Added wxUSE_WXDIB guard to Toolbar sample. --- samples/toolbar/toolbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index ea3134bded..efe6a6a959 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -36,7 +36,7 @@ // define this to use XPMs everywhere (by default, BMPs are used under Win) // BMPs use less space, but aren't compiled into the executable on other platforms -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && wxUSE_WXDIB #define USE_XPM_BITMAPS 0 #else #define USE_XPM_BITMAPS 1