Don't use non-existent icon in XRC sample.

[wxWidgets.git] / include / wx / osx / font.h

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 4d6f07fbc113601803157ed8f78a6c25af1bb674..b05661b4b1f3d43308a67a37ec5a24e246bbb023 100644 (file)
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -36,7 +36,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 public:
     // ctors and such
     wxFont() { }
 public:
     // ctors and such
     wxFont() { }

-    
+

     wxFont( wxOSXSystemFont systemFont );
 
 #if wxOSX_USE_COCOA
     wxFont( wxOSXSystemFont systemFont );
 
 #if wxOSX_USE_COCOA


@@ -101,7 +101,6 @@ public:
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual wxSize GetPixelSize() const;
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual wxSize GetPixelSize() const;

-    virtual wxFontFamily GetFamily() const;

     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual bool GetUnderlined() const;
     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual bool GetUnderlined() const;


@@ -147,11 +146,9 @@ public:
     void* MacGetATSUStyle() const ;
     void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; }
 
     void* MacGetATSUStyle() const ;
     void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; }
 

-#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
     wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
 #endif
     wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
     wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
 #endif

-#endif

 
 #if wxOSX_USE_COCOA
     WX_NSFont OSXGetNSFont() const;
 
 #if wxOSX_USE_COCOA
     WX_NSFont OSXGetNSFont() const;


@@ -168,6 +165,7 @@ public:
 
 protected:
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 
 protected:
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);

+    virtual wxFontFamily DoGetFamily() const;

 
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;