AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed value of resource macros;

Browse Source 
under Win32 when wxUSE_WXDIB=0.
  wxICON
  wxBITMAP
  wxBITMAP_PNG
This commit is contained in:
Tim S 2017-05-07 23:09:30 -04:00
parent ce7788e5ea
commit bd63bb49e3
1 changed files with 4 additions and 4 deletions
Show Stats 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
// ---------------------------------------------------------------------------
#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)