Applied Hartwig's implementation of OS X wxDataViewCtrl

[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 f513354e3545b43a03066b7efee561ed6674e4b6..2113b7570981b7c165a7cae8ed232ccfdf172996 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -56,6 +56,7 @@ public:
 
     // 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;


@@ -68,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);
 


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

-protected:
+private:

     void Unshare();
 
     void Unshare();
 

-private:

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