added disambiguation for Clear() too

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index da34503f2c5afbfe2c42b7fae44abdd98a90e150..8d48ba933e3d8dd4446c21d0e8e636b24bae2a00 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MSW_STATBOX_H_
 #define _WX_MSW_STATBOX_H_
 
 #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
 {
 // Group box
 class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 {


@@ -39,14 +35,39 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 

-    /// Implementation
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    /// Implementation only
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }

 
 protected:
     virtual wxSize DoGetBestSize() 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;
+
+#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();
+
+    // remove the parts which are painted by static box itself from the given
+    // region which is embedded in a rectangle (0, 0)-(w, h)
+    virtual void MSWGetRegionWithoutSelf(WXHRGN hrgn, int w, int h);
+
+    // paint the given rectangle with our background brush/colour
+    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__

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };