Remove commented-out code.

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

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 8c14d461e1c45ebf3a7bb8e6cbba39499335cd77..ddad4ae07d47fae34598433fd507fc2cecd48e18 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -59,7 +59,7 @@ public:
    virtual bool             Show(bool show = TRUE) ;
 
    virtual void         MacRedrawControl () ;
    virtual bool             Show(bool show = TRUE) ;
 
    virtual void         MacRedrawControl () ;

-   virtual void      MacHandleControlClick( WXWidget control , short controlpart ) ;
+   virtual void      MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;

    virtual void             MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label ,
                           const wxPoint& pos,
                           const wxSize& size, long style,
    virtual void             MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label ,
                           const wxPoint& pos,
                           const wxSize& size, long style,


@@ -92,14 +92,6 @@ public:
    inline virtual void SetButtonFont(const wxFont& font);
    inline wxFont& GetLabelFont() const;
    inline wxFont& GetButtonFont() const;
    inline virtual void SetButtonFont(const wxFont& font);
    inline wxFont& GetLabelFont() const;
    inline wxFont& GetButtonFont() const;

-
-   // Adds callback
-   inline void Callback(const wxFunction function);
-
-   wxFunction GetCallback() { return m_callback; }
-
-protected:
-   wxFunction       m_callback;     // Callback associated with the window

 #endif // WXWIN_COMPATIBILITY
 
 protected:
 #endif // WXWIN_COMPATIBILITY
 
 protected:


@@ -119,7 +111,6 @@ private:
 
 
 #if WXWIN_COMPATIBILITY
 
 
 #if WXWIN_COMPATIBILITY

-    inline void wxControl::Callback(const wxFunction f) { m_callback = f; };

     inline wxFont& wxControl::GetLabelFont() const { return GetFont(); }
     inline wxFont& wxControl::GetButtonFont() const { return GetFont(); }
     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
     inline wxFont& wxControl::GetLabelFont() const { return GetFont(); }
     inline wxFont& wxControl::GetButtonFont() const { return GetFont(); }
     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }