__MWERKS__ check now doesn't give compilation error with VC++

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index e1970721ae05c13c99f532a5f558141097b0951f..3f15d25e376c77c04ea69ece248dd7e2e5c3d524 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __STATBOXH__
-#define __STATBOXH__
+#ifndef _WX_STATBOX_H_
+#define _WX_STATBOX_H_

 
 #ifdef __GNUG__
 #pragma interface "statbox.h"
 
 #ifdef __GNUG__
 #pragma interface "statbox.h"


@@ -52,6 +52,9 @@ class WXDLLEXPORT wxStaticBox: public wxControl
   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }

   void SetLabel(const wxString& label);
   virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
   void SetLabel(const wxString& label);
   virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);


@@ -60,4 +63,4 @@ DECLARE_EVENT_TABLE()
 };
 
 #endif
 };
 
 #endif

-    // __STATBOXH__
+    // _WX_STATBOX_H_