don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index 66da229103fb0bd56c18df12937ff27f09cd928b..683210780484fe978adba7be7f1f6e523a6b51d4 100644 (file)
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -12,15 +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"
 

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

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


@@ -48,8 +42,8 @@ public:
     //
     // 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


@@ -65,8 +59,17 @@ public:
                                  );
 
 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;
 

+    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