fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/statline.h b/include/wx/statline.h
index 18d48a7f688e72bcb4ef0b948a4e5d6a9f9822bd..905bb3152f7b5de236c1483b4885d3001936baa0 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
-extern WXDLLEXPORT_DATA(const wxChar*) wxStaticTextNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
@@ -84,8 +84,10 @@ protected:
     #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/statline.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/statline.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statline.h"
 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)