Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

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

diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index 36065b6faec01b504c76aecf75f76cd3b87a2d93..c4578fa6c20a746b476c4d3312009713151139c4 100644 (file)
--- a/include/wx/univ/statbox.h
+++ b/include/wx/univ/statbox.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     15.08.00
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBOX_H_
 #define _WX_UNIV_STATBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "univstatbox.h"
 #endif
 
@@ -26,7 +26,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,
@@ -58,6 +58,10 @@ protected:
     // 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)
 };