Added wxDataViewListCtrl, use it in the sample

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index efeeee65b21f8f6ff4631148ef43ccc3ad4731c8..203790654a6e0875a5632d66ba9a2d86e71495df 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,7 +46,10 @@ public:
         *borderOther = BORDER;
     }
 
         *borderOther = BORDER;
     }
 

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

     DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };
 


@@ -61,7 +64,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbox.h"
 #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__)