From: Václav Slavík Date: Sun, 28 Nov 1999 18:20:14 +0000 (+0000) Subject: fixed wxBITMAP macro under wxGTK X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bab537dc3777d39314b28424890ac8048efcf49f fixed wxBITMAP macro under wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index b89c81760a..ed81546eec 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -163,6 +163,9 @@ enum wxStockCursor #if defined(__WXMSW__) || defined(__WXPM__) #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE) +#elif defined(__WXGTK__) + // Initialize from an included XPM + #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm ) #else // !(Windows || OS2) #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM) #endif // platform