fix bcc bug

[wxWidgets.git] / include / wx / univ / window.h

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index d3a845d84ad680d96788507aa330dd5b416cd8b1..2c0d484df64181d3880b92dfbe40fa7302e9f65f 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -171,6 +171,16 @@ public:
     // control (e.g. a button, checkbox, ...)
     virtual bool IsContainerWindow() const { return FALSE; }
 
     // control (e.g. a button, checkbox, ...)
     virtual bool IsContainerWindow() const { return FALSE; }
 

+    // returns TRUE if the control has "transparent" areas such
+    // as a wxStaticText and wxCheckBox and the background should
+    // be adapted from a parent window
+    virtual bool HasTransparentBackground() { return FALSE; }
+    
+    // to be used with function above: transparent windows get
+    // their background from parents that return TRUE here,
+    // so this is mostly for wxPanel, wxTopLevelWindow etc.
+    virtual bool ProvidesBackground() const { return FALSE; }
+

     // return TRUE if this control can be highlighted when the mouse is over
     // it (the theme decides itself whether it is really highlighted or not)
     virtual bool CanBeHighlighted() const { return FALSE; }
     // return TRUE if this control can be highlighted when the mouse is over
     // it (the theme decides itself whether it is really highlighted or not)
     virtual bool CanBeHighlighted() const { return FALSE; }


@@ -201,9 +211,6 @@ public:
     // erase part of the control
     virtual void EraseBackground(wxDC& dc, const wxRect& rect);
     
     // erase part of the control
     virtual void EraseBackground(wxDC& dc, const wxRect& rect);
     

-    // see below
-    bool HasDialogBackground() { return m_hasDialogBackground; }
-

     // overridden base class methods
     // -----------------------------
 
     // overridden base class methods
     // -----------------------------
 


@@ -270,10 +277,6 @@ protected:
     // the renderer we use
     wxRenderer *m_renderer;
     
     // the renderer we use
     wxRenderer *m_renderer;
     

-    // background like a dialog (e.g. wxStaticText,
-    // wxRadioButton), not with a surface (wxButton)
-    bool m_hasDialogBackground;
-

     // background bitmap info
     wxBitmap  m_bitmapBg;
     int       m_alignBgBitmap;
     // background bitmap info
     wxBitmap  m_bitmapBg;
     int       m_alignBgBitmap;