using newer API

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index ae0cd5030e7f7d74f1bf75f2faa8691111508e24..34bf7ccc120e0472b461f480a321e93fa93224fe 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
 {


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

+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+

 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);
 
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 

-    virtual WXHRGN MSWCalculateClippingRegion();
-    virtual void MSWClipBoxRegion(WXHRGN hrgn, const WXRECTPTR rc);
+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);
     void OnPaint(wxPaintEvent& event);

+#endif // !__WXWINCE__

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)

-    DECLARE_EVENT_TABLE()

 };
 
 #endif // _WX_MSW_STATBOX_H_
 };
 
 #endif // _WX_MSW_STATBOX_H_