made wx[Array]TreeItemId[s] more backwards compatible

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

diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index cd43d75f36407e651f4e42b3f9cd80e84627be5a..2e49e1a9db1c741ded5eafb1de4b32efabfdc851 100644 (file)
--- a/include/wx/univ/statbox.h
+++ b/include/wx/univ/statbox.h
@@ -6,14 +6,14 @@
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBOX_H_
 #define _WX_UNIV_STATBOX_H_
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBOX_H_
 #define _WX_UNIV_STATBOX_H_
 
 #ifdef __GNUG__

-    #pragma interface "statbox.h"
+    #pragma interface "univstatbox.h"

 #endif
 
 class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 #endif
 
 class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase


@@ -51,6 +51,8 @@ public:
     // take account of this
     virtual wxPoint GetBoxAreaOrigin() const;
 
     // take account of this
     virtual wxPoint GetBoxAreaOrigin() const;
 

+    virtual bool HasTransparentBackground() { return TRUE; }
+    

 protected:
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);
 protected:
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);


@@ -58,6 +60,10 @@ protected:
     // get the size of the border
     wxRect GetBorderGeometry() const;
 
     // get the size of the border
     wxRect GetBorderGeometry() const;
 

+    // returning TRUE from here ensures that we act as a container window for
+    // our children
+    virtual bool IsStaticBox() const { return TRUE; }
+

 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };