Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #478 from stahta01/staging

Browse Source 
Fix wxGTK/Win32 build with "--disable-wxdib".
This commit is contained in:
VZ
2017-05-22 00:25:03 +02:00
committed by GitHub
parent 84e58117f8 2d0ac3d027
commit d2c2274baa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gdicmn.h
View File

@@ -183,7 +183,7 @@ enum wxEllipsizeMode
// macros // macros
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#if defined(__WINDOWS__) #if defined(__WINDOWS__) && wxUSE_WXDIB
#define wxHAS_IMAGES_IN_RESOURCES #define wxHAS_IMAGES_IN_RESOURCES
#endif #endif
@@ -197,7 +197,7 @@ enum wxEllipsizeMode
wxIcon *icon = new wxIcon(sample_xpm); // On wxGTK/Linux wxIcon *icon = new wxIcon(sample_xpm); // On wxGTK/Linux
*/ */
#ifdef __WINDOWS__ #ifdef wxHAS_IMAGES_IN_RESOURCES
// Load from a resource // Load from a resource
#define wxICON(X) wxIcon(wxT(#X)) #define wxICON(X) wxIcon(wxT(#X))
#elif defined(__WXDFB__) #elif defined(__WXDFB__)
@@ -227,7 +227,7 @@ enum wxEllipsizeMode
under Unix bitmaps live in XPMs and under Windows they're in ressources. 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) #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE)
#elif defined(__WXGTK__) || \ #elif defined(__WXGTK__) || \
defined(__WXMOTIF__) || \ defined(__WXMOTIF__) || \
@@ -256,7 +256,7 @@ enum wxEllipsizeMode
// resource type and under OS X the PNG file with the specified name must be // 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 // available in the resource subdirectory of the bundle. Elsewhere, this is
// exactly the same thing as wxBITMAP_PNG_FROM_DATA() described above. // 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) #define wxBITMAP_PNG(name) wxBitmap(wxS(#name), wxBITMAP_TYPE_PNG_RESOURCE)
#else #else
#define wxBITMAP_PNG(name) wxBITMAP_PNG_FROM_DATA(name) #define wxBITMAP_PNG(name) wxBITMAP_PNG_FROM_DATA(name)

2
samples/toolbar/toolbar.cpp
View File

@@ -36,7 +36,7 @@
// define this to use XPMs everywhere (by default, BMPs are used under Win) // 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 // 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 #define USE_XPM_BITMAPS 0
#else #else
#define USE_XPM_BITMAPS 1 #define USE_XPM_BITMAPS 1