make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index 87913032c81b408ec62d26f089519811ac506f6c..333e1985dc3a411beb383986a805172a16f9dab1 100644 (file)
--- a/include/wx/univ/statbox.h
+++ b/include/wx/univ/statbox.h
@@ -6,16 +6,12 @@
 // 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__
-    #pragma interface "univstatbox.h"
-#endif
-
 class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 {
 public:
@@ -26,7 +22,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize)
     {
-        Create(parent, -1, label, pos, size);
+        Create(parent, wxID_ANY, label, pos, size);
     }
 
     wxStaticBox(wxWindow *parent, wxWindowID id,
@@ -51,6 +47,10 @@ public:
     // take account of this
     virtual wxPoint GetBoxAreaOrigin() const;
 
+    // returning true from here ensures that we act as a container window for
+    // our children
+    virtual bool IsStaticBox() const { return true; }
+
 protected:
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);