keep the old wxFont::Create() signature (changed by font size in pixels patch) to...

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 55602617a4956dd728847b514b465716ffbaf929..396cf35fefbdc8f1bbeeb0016aa234794b83c74e 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -26,9 +26,7 @@ public:
              ,const wxPoint&     rPos = wxDefaultPosition
              ,const wxSize&      rSize = wxDefaultSize
              ,long               lStyle = 0
              ,const wxPoint&     rPos = wxDefaultPosition
              ,const wxSize&      rSize = wxDefaultSize
              ,long               lStyle = 0

-#if wxUSE_VALIDATORS

              ,const wxValidator& rValidator = wxDefaultValidator
              ,const wxValidator& rValidator = wxDefaultValidator

-#endif

              ,const wxString&    rsName = wxControlNameStr
             )
     {
              ,const wxString&    rsName = wxControlNameStr
             )
     {


@@ -48,12 +46,12 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxControlNameStr
                );
 
                 ,const wxString&    rsName = wxControlNameStr
                );
 

+    virtual void SetLabel(const wxString& rsLabel);
+

     //
     // Simulates an event
     //
     //
     // Simulates an event
     //


@@ -73,7 +71,7 @@ public:
     // For ownerdraw items
     //
     virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; };
     // For ownerdraw items
     //
     virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; };

-    virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; };
+    virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };

 
     wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
     void             OnEraseBackground(wxEraseEvent& rEvent);
 
     wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
     void             OnEraseBackground(wxEraseEvent& rEvent);


@@ -85,25 +83,6 @@ public:
                                 ,WXLPARAM lParam
                                );
 
                                 ,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;
-
-    //
-    // Adds callback
-    //
-    inline void Callback(const wxFunction function);
-    wxFunction  GetCallback(void) { return m_callback; }
-
-protected:
-    wxFunction                      m_callback;     // Callback associated with the window
-#endif // WXWIN_COMPATIBILITY
-

 public:
     //
     // For controls like radiobuttons which are really composite
 public:
     //
     // For controls like radiobuttons which are really composite


@@ -151,13 +130,5 @@ private:
    DECLARE_EVENT_TABLE()
 }; // end of wxControl
 
    DECLARE_EVENT_TABLE()
 }; // end of wxControl
 

-#if WXWIN_COMPATIBILITY
-    inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
-    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_
 
 #endif // _WX_CONTROL_H_