guarding agains NULL

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 0922fe12eed42c10955b6d6ef641ed379dd40b3f..15b25cb4e2b1ba0ec159b65f02b4e8f41f25cb3f 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_
 
 #ifndef _WX_MSW_STATBOX_H_
 #define _WX_MSW_STATBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statbox.h"
-#endif
-

 // Group box
 // Group box

-class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase

 {
 public:
     wxStaticBox() { }
 {
 public:
     wxStaticBox() { }


@@ -42,12 +38,23 @@ 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;
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+
+    virtual wxPoint GetClientAreaOrigin() const;
+    virtual void DoGetClientSize(int *width, int *height) const;
+
+

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

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+#ifndef __WXWINCE__
+public:

     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     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();
 
     // return the region with all the windows inside this static box excluded
     virtual WXHRGN MSWGetRegionWithoutChildren();
 


@@ -55,10 +62,13 @@ protected:
     // region which is embedded in a rectangle (0, 0)-(w, h)
     virtual void MSWGetRegionWithoutSelf(WXHRGN hrgn, int w, int h);
 
     // 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 colour
-    void PaintBackground(wxDC& dc, const struct tagRECT& rc);
+    // 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)
 };