X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76ed8f8d9c2b826d77d70b41c046decbde23da35..3218cf580bf2249f20748aad4f78e339cf5fa02f:/include/wx/gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 9ea245de1c..9b97b7d0f8 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -179,6 +179,8 @@ class WXDLLEXPORT wxRegion;
 #define wxBITMAP_TYPE_GIF_RESOURCE      14
 #define wxBITMAP_TYPE_PNG               15
 #define wxBITMAP_TYPE_PNG_RESOURCE      16
+#define wxBITMAP_TYPE_JPEG              17
+#define wxBITMAP_TYPE_JPEG_RESOURCE     18
 #define wxBITMAP_TYPE_ANY               50
 
 #define wxBITMAP_TYPE_RESOURCE wxBITMAP_TYPE_BMP_RESOURCE
@@ -303,9 +305,6 @@ WXDLLEXPORT_DATA(extern wxBrush)  		wxNullBrush;
 WXDLLEXPORT_DATA(extern wxPalette) 		wxNullPalette;
 WXDLLEXPORT_DATA(extern wxFont)   		wxNullFont;
 WXDLLEXPORT_DATA(extern wxColour) 		wxNullColour;
-#ifdef __WXGTK__
-WXDLLEXPORT_DATA(extern wxRegion) 		wxNullRegion;
-#endif
 
 // Stock cursors types
 WXDLLEXPORT_DATA(extern wxCursor*)		wxSTANDARD_CURSOR;