Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index 83f0a4f9cc7c33adfc485a31e61ca16d3d61ad71..eb1cb116c84bcbadfb70d6ab4a6388b8ba534445 100644 (file)
--- a/include/wx/univ/statbox.h
+++ b/include/wx/univ/statbox.h
@@ -6,17 +6,13 @@
 // 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:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBOX_H_
 #define _WX_UNIV_STATBOX_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBOX_H_
 #define _WX_UNIV_STATBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstatbox.h"
-#endif
-
-class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase

 {
 public:
     wxStaticBox() { }
 {
 public:
     wxStaticBox() { }


@@ -26,7 +22,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,


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

-    virtual bool HasTransparentBackground() { return TRUE; }
-    
+    // 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);
 protected:
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);


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