fixed compilation if wxUSE_STL=1

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

diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index 56fe3b63d82cd43786b1cca9563efc2068896900..13997365374b85273f873a2c1b8a8b85aef36859 100644 (file)
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -12,21 +12,12 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

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

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
-class WXDLLEXPORT wxStaticText : public wxControl
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase

 {
 {

- DECLARE_DYNAMIC_CLASS(wxStaticText)
-
- public:
+public:

     inline wxStaticText() { }
     inline wxStaticText() { }

-

     inline wxStaticText( wxWindow*       pParent
                         ,wxWindowID      vId
                         ,const wxString& rsLabel
     inline wxStaticText( wxWindow*       pParent
                         ,wxWindowID      vId
                         ,const wxString& rsLabel


@@ -51,8 +42,8 @@ class WXDLLEXPORT wxStaticText : public wxControl
     //
     // Accessors
     //
     //
     // Accessors
     //

-    void SetLabel(const wxString&);
-    bool SetFont(const wxFont &rFont);
+    virtual void SetLabel(const wxString& rsLabel);
+    virtual bool SetFont(const wxFont &rFont);

 
     //
     // Overriden base class virtuals
 
     //
     // Overriden base class virtuals


@@ -68,7 +59,16 @@ class WXDLLEXPORT wxStaticText : public wxControl
                                  );
 
 protected:
                                  );
 
 protected:

+    virtual void   DoSetSize( int nX
+                             ,int nY
+                             ,int nWidth
+                             ,int nHeight
+                             ,int nSizeFlags = wxSIZE_AUTO
+                            );

     virtual wxSize DoGetBestSize(void) const;
     virtual wxSize DoGetBestSize(void) const;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticText)

 }; // end of CLASS wxStaticText
 
 #endif
 }; // end of CLASS wxStaticText
 
 #endif