Temporarily disable colour picker to keep build working and bofore finding nice repla...

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 2e18c72266580dfcf3f65202ff5685e36fddc5d7..34bf7ccc120e0472b461f480a321e93fa93224fe 100644 (file)
--- 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:
 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:


@@ -9,12 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_STATBOX_H_
-#define _WX_STATBOX_H_
-
-#ifdef __GNUG__
-    #pragma interface "statbox.h"
-#endif
+#ifndef _WX_MSW_STATBOX_H_
+#define _WX_MSW_STATBOX_H_

 
 // Group box
 class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 
 // Group box
 class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase


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

-    // implementation from now on
-    // --------------------------
-
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    /// Implementation only
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;

 
 

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    // 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)

 };
 
 };
 

-#endif
-    // _WX_STATBOX_H_
+#endif // _WX_MSW_STATBOX_H_
+