check for wxUSE_TIMER in headers, not the files including them

[wxWidgets.git] / include / wx / mac / carbon / font.h

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index c28ed650b7ab2c42cae7f890e497bc93ad88fbec..2113b7570981b7c165a7cae8ed232ccfdf172996 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -20,13 +20,7 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxFont() { Init(); }
-    wxFont(const wxFont& font)
-        : wxFontBase()
-    {
-        Init();
-        Ref(font);
-    }
+    wxFont() { }

 
     wxFont(int size,
            int family,
 
     wxFont(int size,
            int family,


@@ -36,15 +30,11 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
-

         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
     wxFont(const wxNativeFontInfo& info)
     {
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
     wxFont(const wxNativeFontInfo& info)
     {

-        Init();
-

         (void)Create(info);
     }
 
         (void)Create(info);
     }
 


@@ -64,11 +54,9 @@ public:
     
     virtual ~wxFont();
 
     
     virtual ~wxFont();
 

-    // assignment
-    wxFont& operator=(const wxFont& font);
-

     // implement base class pure virtuals
     virtual int GetPointSize() const;
     // implement base class pure virtuals
     virtual int GetPointSize() const;

+    virtual wxSize GetPixelSize() const;

     virtual int GetFamily() const;
     virtual int GetStyle() const;
     virtual int GetWeight() const;
     virtual int GetFamily() const;
     virtual int GetStyle() const;
     virtual int GetWeight() const;


@@ -81,7 +69,7 @@ public:
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);

-    virtual void SetFaceName(const wxString& faceName);
+    virtual bool SetFaceName(const wxString& faceName);

     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 


@@ -110,13 +98,9 @@ public:
     // Returns an ATSUStyle not ATSUStyle*
     void* MacGetATSUStyle() const ; 
     
     // Returns an ATSUStyle not ATSUStyle*
     void* MacGetATSUStyle() const ; 
     

-protected:
-    // common part of all ctors
-    void Init();
-
+private:

     void Unshare();
 
     void Unshare();
 

-private:

     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };