do platform-specific checks after ensuring that the symbols we use are defined; extra...

[wxWidgets.git] / include / wx / statbmp.h

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 80b4d2dcf819289760fd15993b5707bc483fa05c..73f773c9f81d48bb0a93971e8c180cf613b79a56 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -20,7 +20,7 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
@@ -56,8 +56,10 @@ protected:
     #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbmp.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/statbmp.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
 #elif defined(__WXCOCOA__)