Add a test of precisely sized status bar fields.

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index c6e3cf91ab8f94bb0ac372b10505b7cc6ce9ffd1..27180f2c1eeba7d1b396dcffd8748b9cff83facd 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -13,7 +13,7 @@
 #define _WX_MSW_STATBOX_H_
 
 // Group box
 #define _WX_MSW_STATBOX_H_
 
 // Group box

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

 {
 public:
     wxStaticBox() { }
 {
 public:
     wxStaticBox() { }


@@ -38,17 +38,19 @@ public:
     /// Implementation only
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 
     /// Implementation only
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 

-protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 

-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const;
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }

 
 

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+protected:
+    virtual wxSize DoGetBestSize() const;

 
 #ifndef __WXWINCE__
 
 #ifndef __WXWINCE__

+public:

     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 

+protected:

     // return the region with all the windows inside this static box excluded
     virtual WXHRGN MSWGetRegionWithoutChildren();
 
     // return the region with all the windows inside this static box excluded
     virtual WXHRGN MSWGetRegionWithoutChildren();