X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9b1d6c8ddc0e923c368529efb0e011edeec44e6..fbbdc52c5d2671ff1b296c70d6e426beb3d09a61:/include/wx/os2/control.h

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 55602617a4..8da501c1d2 100644
--- 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
-#if wxUSE_VALIDATORS
              ,const wxValidator& rValidator = wxDefaultValidator
-#endif
              ,const wxString&    rsName = wxControlNameStr
             )
     {
@@ -48,9 +46,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                 ,const wxString&    rsName = wxControlNameStr
                );
 
@@ -73,7 +69,7 @@ public:
     // 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);
@@ -93,15 +89,6 @@ public:
     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:
@@ -152,7 +139,6 @@ private:
 }; // 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); }