Let Cygwin be a Windows build for wxMSW and a unix build otherwise

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

diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index cd43d75f36407e651f4e42b3f9cd80e84627be5a..c4578fa6c20a746b476c4d3312009713151139c4 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_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBOX_H_
 #define _WX_UNIV_STATBOX_H_
 

-#ifdef __GNUG__
-    #pragma interface "statbox.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "univstatbox.h"

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


@@ -26,7 +26,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize)
     {
                 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,
     }
 
     wxStaticBox(wxWindow *parent, wxWindowID id,


@@ -58,6 +58,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)
 };