Allow wxThread::Wait() and Delete() to block, even under wxMSW.

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 6c27b9050cae6c981addd37adba3cbaef7345af1..27180f2c1eeba7d1b396dcffd8748b9cff83facd 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -12,12 +12,8 @@
 #ifndef _WX_MSW_STATBOX_H_
 #define _WX_MSW_STATBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statbox.h"
-#endif
-
 // Group box
-class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
 {
 public:
     wxStaticBox() { }
@@ -42,17 +38,19 @@ public:
     /// 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__
+public:
     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();
 
@@ -61,7 +59,9 @@ protected:
     virtual void MSWGetRegionWithoutSelf(WXHRGN hrgn, int w, int h);
 
     // paint the given rectangle with our background brush/colour
-    void PaintBackground(wxDC& dc, const struct tagRECT& rc);
+    virtual void PaintBackground(wxDC& dc, const struct tagRECT& rc);
+    // paint the foreground of the static box
+    virtual void PaintForeground(wxDC& dc, const struct tagRECT& rc);
 
     void OnPaint(wxPaintEvent& event);
 #endif // !__WXWINCE__