extracted code calling {Ole|Co}[Un]Initialize() to wxOle[Un]Initialize() functions...

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 4d409ab3737b9e821e9c0f0b72a8cd2b574347db..41d29b05b90a97b9db1be5996085dfe40f822e87 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -5,7 +5,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBoxNameStr;
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
@@ -18,26 +18,39 @@ public:
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
-    virtual bool CanApplyParentThemeBackground() const { return true; }
+    virtual bool HasTransparentBackground() { return true; }
+
+    // implementation only: this is used by wxStaticBoxSizer to account for the
+    // need for extra space taken by the static box
+    //
+    // the top border is the margin at the top (where the title is),
+    // borderOther is the margin on all other sides
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const
+    {
+        static const int BORDER = 5; // FIXME: hardcoded value
+
+        *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
+        *borderOther = BORDER;
+    }
 
 private:
     DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };
 
 #if defined(__WXUNIVERSAL__)
-#include "wx/univ/statbox.h"
+    #include "wx/univ/statbox.h"
 #elif defined(__WXMSW__)
-#include "wx/msw/statbox.h"
+    #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/statbox.h"
+    #include "wx/motif/statbox.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/statbox.h"
+    #include "wx/gtk/statbox.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/statbox.h"
+    #include "wx/mac/statbox.h"
 #elif defined(__WXCOCOA__)
-#include "wx/cocoa/statbox.h"
+    #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)
-#include "wx/os2/statbox.h"
+    #include "wx/os2/statbox.h"
 #endif
 
 #endif // wxUSE_STATBOX