don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 29ab7c42e0abe857959de886057b8ec5d705652a..2b3683d3d722a933eac3d39fba5ec5ae9f51a67a 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -18,13 +18,13 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStaticBoxBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl

 {
 public:
     wxStaticBoxBase() { }
 {
 public:
     wxStaticBoxBase() { }


@@ -46,8 +46,11 @@ public:
         *borderOther = BORDER;
     }
 
         *borderOther = BORDER;
     }
 

-private:
-    DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
+protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
+    wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -56,10 +59,12 @@ private:
     #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbox.h"
     #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbox.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/statbox.h"
     #include "wx/gtk/statbox.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbox.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-    #include "wx/mac/statbox.h"
+    #include "wx/osx/statbox.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)