Renamed HasChildren() to IsContainer(), added GetParent() to wxDataViewModel

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 836de6c3bf35165150e69a4bcdc098880516170d..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,17 +38,19 @@ 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;
 
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 

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

 #ifndef __WXWINCE__
 #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();
 


@@ -61,7 +59,7 @@ protected:
     virtual void MSWGetRegionWithoutSelf(WXHRGN hrgn, int w, int h);
 
     // paint the given rectangle with our background brush/colour
     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);
+    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);
 
     // paint the foreground of the static box
     virtual void PaintForeground(wxDC& dc, const struct tagRECT& rc);