decouple item index from string value (patch 1905702)

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index aea08aca5efb4727f4ff730e30c46bb51e422c6f..873e5d15e533707c5d80cbbfdb8996ad4f1f26be 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBoxNameStr;
+extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
@@ -46,7 +46,10 @@ public:
         *borderOther = BORDER;
     }
 
-private:
+protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };
 
@@ -56,8 +59,10 @@ private:
     #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/statbox.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statbox.h"
 #elif defined(__WXCOCOA__)