X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0532484d0f2f5fd592c16522a2b45e84422c9a5f..b1d66b5415f7befb45e050d7097571642b8bfa56:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 063bce9b80..c09a1808f2 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -153,8 +153,8 @@ enum wxStockCursor // Load from a resource #define wxICON(X) wxIcon("" #X "") #elif defined(__WXMGL__) - // Load from a resource - #define wxICON(X) wxIcon("" #X "") + // Initialize from an included XPM + #define wxICON(X) wxIcon( (const char**) X##_xpm ) #elif defined(__WXGTK__) // Initialize from an included XPM #define wxICON(X) wxIcon( (const char**) X##_xpm ) @@ -173,9 +173,9 @@ enum wxStockCursor under Unix bitmaps live in XPMs and under Windows they're in ressources. */ -#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMGL__) +#if defined(__WXMSW__) || defined(__WXPM__) #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE) -#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) // Initialize from an included XPM #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm ) #else // other platforms