X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70dc287a3997b65d954bfbd5861f72696bd3dd27..c27bcbd5a7cec9f03b15c69824da99c5bb75924a:/include/wx/os2/control.h

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 8da501c1d2..396cf35fef 100644
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -50,6 +50,8 @@ public:
                 ,const wxString&    rsName = wxControlNameStr
                );
 
+    virtual void SetLabel(const wxString& rsLabel);
+
     //
     // Simulates an event
     //
@@ -81,16 +83,6 @@ public:
                                 ,WXLPARAM lParam
                                );
 
-#if WXWIN_COMPATIBILITY
-    virtual void SetButtonColour(const wxColour& WXUNUSED(rCol)) { }
-    wxColour*    GetButtonColour(void) const { return NULL; }
-
-    inline virtual void SetLabelFont(const wxFont& rFont);
-    inline virtual void SetButtonFont(const wxFont& rFont);
-    inline wxFont&      GetLabelFont(void) const;
-    inline wxFont&      GetButtonFont(void) const;
-#endif // WXWIN_COMPATIBILITY
-
 public:
     //
     // For controls like radiobuttons which are really composite
@@ -138,12 +130,5 @@ private:
    DECLARE_EVENT_TABLE()
 }; // end of wxControl
 
-#if WXWIN_COMPATIBILITY
-    inline wxFont& wxControl::GetLabelFont(void) const { return GetFont(); }
-    inline wxFont& wxControl::GetButtonFont(void) const { return GetFont(); }
-    inline void wxControl::SetLabelFont(const wxFont& rFont) { SetFont(rFont); }
-    inline void wxControl::SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
-#endif // WXWIN_COMPATIBILITY
-
 #endif // _WX_CONTROL_H_