Partial Watcom C++ 10.6 support added (doesn't link for some reason)

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 8dd0bcb76f5779a360b102f4b8154b711648676c..432987cf5e9e3dcb3b5f48f96f10b117e622d7eb 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.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 __STATTEXTH__
-#define __STATTEXTH__
+#ifndef _WX_STATTEXT_H_
+#define _WX_STATTEXT_H_

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


@@ -45,6 +45,9 @@ class WXDLLEXPORT wxStaticText: public wxControl
 
   // accessors
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 
   // accessors
   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&);
 
   // operations
   void SetLabel(const wxString&);
 
   // operations


@@ -61,4 +64,4 @@ class WXDLLEXPORT wxStaticText: public wxControl
 };
 
 #endif
 };
 
 #endif

-    // __STATTEXTH__
+    // _WX_STATTEXT_H_