Applied notebook font patch.

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

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index d39c5c624ad946d98e1badb738c0a9d45e75fdd9..cc588f3861d7816bb2ba321293379ca5abce7402 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "control.h"
 #endif
 
@@ -57,7 +57,8 @@ public:
    
    virtual bool             Enable(bool enable = TRUE) ;
    virtual bool             Show(bool show = TRUE) ;
-
+   virtual void             DoSetWindowVariant( wxWindowVariant variant ) ;
+ 
    virtual void         MacRedrawControl () ;
    virtual void      MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
    virtual void             MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label ,
@@ -84,24 +85,6 @@ public:
    virtual void         Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;
    WXWidget     GetMacControl() { return m_macControl ;}
 
-#if WXWIN_COMPATIBILITY
-   virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   wxColour* GetButtonColour() const { return NULL; }
-
-   inline virtual void SetLabelFont(const wxFont& font);
-   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:
    // For controls like radiobuttons which are really composite
    WXWidget m_macControl ;
@@ -118,14 +101,6 @@ private:
 };
 
 
-#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 void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
-#endif // WXWIN_COMPATIBILITY
-
 wxControl *wxFindControlFromMacControl(WXWidget inControl ) ;
 void wxAssociateControlWithMacControl(WXWidget inControl, wxControl *control) ;
 void wxRemoveMacControlAssociation(wxControl *control) ;