X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcc46c75590b4127bbfd5b164b9c3f8f44980a84..634157786d854ad3802ebd934d51c4cd9726ef8f:/include/wx/gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index d19e021358..b787855e72 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -70,6 +70,8 @@ enum
     wxBITMAP_TYPE_JPEG_RESOURCE,
     wxBITMAP_TYPE_PNM,
     wxBITMAP_TYPE_PNM_RESOURCE,
+    wxBITMAP_TYPE_PCX,
+    wxBITMAP_TYPE_PCX_RESOURCE,
     wxBITMAP_TYPE_ANY = 50
 };
 
@@ -147,6 +149,16 @@ enum wxStockCursor
     #define wxICON(X) wxIcon("" #X "")
 #endif // platform
 
+/* Another macro: this one is for portable creation of bitmaps. We assume that
+   under Unix bitmaps live in XPMs and under Windows they're in ressources.
+ */
+
+#if defined(__WXMSW__) || defined(__WXPM__)
+    #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
+#else // !(Windows || OS2)
+    #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM)
+#endif // platform
+
 // ===========================================================================
 // classes
 // ===========================================================================