Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index b061ae950f30472ba18b9291ebac149bd847af2c..d730409fd33c16d3afb9f8fa71e0bde590de0ed4 100644 (file)
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        stattext.h
+// Name:        wx/os2/stattext.h

 // Purpose:     wxStaticText class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxStaticText class
 // Author:      David Webster
 // Modified by:


@@ -12,13 +12,9 @@
 #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"
 

-class WXDLLEXPORT wxStaticText : public wxStaticTextBase
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase

 {
 public:
     inline wxStaticText() { }
 {
 public:
     inline wxStaticText() { }


@@ -50,7 +46,7 @@ public:
     virtual bool SetFont(const wxFont &rFont);
 
     //
     virtual bool SetFont(const wxFont &rFont);
 
     //

-    // Overriden base class virtuals
+    // Overridden base class virtuals

     //
     virtual bool AcceptsFocus() const { return FALSE; }
 
     //
     virtual bool AcceptsFocus() const { return FALSE; }
 


@@ -71,6 +67,9 @@ protected:
                             );
     virtual wxSize DoGetBestSize(void) const;
 
                             );
     virtual wxSize DoGetBestSize(void) const;
 

+    virtual void DoSetLabel(const wxString& str);
+    virtual wxString DoGetLabel() const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 }; // end of CLASS wxStaticText
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 }; // end of CLASS wxStaticText