X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/222594ead7a8ed85cb0c709850b2eed07fc3ac86..d69f2e34caebbe1b265814c9de60d7b41a06d561:/include/wx/msw/statbox.h

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index e1d5f2e85a..836de6c3bf 100644
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbox.h
+// Name:        wx/msw/statbox.h
 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:
@@ -9,22 +9,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_STATBOX_H_
-#define _WX_STATBOX_H_
+#ifndef _WX_MSW_STATBOX_H_
+#define _WX_MSW_STATBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "statbox.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
-
 // Group box
-class WXDLLEXPORT wxStaticBox : public wxControl
+class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 {
-DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
 public:
     wxStaticBox() { }
 
@@ -45,20 +39,37 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
-    // implementation from now on
-    // --------------------------
+    /// Implementation only
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+protected:
+    virtual wxSize DoGetBestSize() const;
 
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const;
 
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-protected:
-    virtual wxSize DoGetBestSize();
+#ifndef __WXWINCE__
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+    // 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
+    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)
 };
 
-#endif
-    // _WX_STATBOX_H_
+#endif // _WX_MSW_STATBOX_H_
+