From 1d965e2fb13afd9ee5aaebaaf7e9b884ed5b3971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 15 Nov 2001 23:55:08 +0000 Subject: [PATCH] use XPMs in wxMGL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 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 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