X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e52f60e65236befe1a509cc3c1823607be0d2b3c..937cf827cae4537a354aec3db8a7c0f85fd3ca35:/include/wx/gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 2f2570797a..9ea245de1c 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -156,6 +156,7 @@ class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxPalette;
+class WXDLLEXPORT wxRegion;
 
 /*
  * Bitmap flags
@@ -302,6 +303,9 @@ 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;
@@ -331,9 +335,12 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 // Load from a resource
 # define wxICON(X) wxIcon("" #X "")
 
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+#elif defined(__WXGTK__)
 // Initialize from an included XPM
 # define wxICON(X) wxIcon( (const char**) X##_xpm )
+#elif defined(__WXMOTIF__)
+// Initialize from an included XPM
+# define wxICON(X) wxIcon( X##_xpm )
 #else
 
 // This will usually mean something on any platform
@@ -350,11 +357,13 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 
 class WXDLLEXPORT wxResourceCache: public wxList
 {
-  DECLARE_DYNAMIC_CLASS(wxResourceCache)
- public:
-   wxResourceCache();
-   wxResourceCache(const unsigned int the_key_type);
-   ~wxResourceCache();
+public:
+    wxResourceCache() { }
+    wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
+    ~wxResourceCache();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxResourceCache)
 };
 
 #endif