renamed wxWave to wxSound; compatibility fixes

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 68799b2c5be2fc4fd3f2da01506b0b6175ad7e67..a8781d4db4d521fbb5f824b717a665e99d4b61a9 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -6,13 +6,13 @@
 // Created:     20.09.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_BASE_
 #define _WX_FONT_H_BASE_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "fontbase.h"
 #endif
 
@@ -156,7 +156,7 @@ public:
     virtual bool GetUnderlined() const = 0;
     virtual wxString GetFaceName() const = 0;
     virtual wxFontEncoding GetEncoding() const = 0;
-    virtual wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const = 0;
 
     virtual bool IsFixedWidth() const;
 
@@ -171,7 +171,8 @@ public:
     virtual void SetFaceName( const wxString& faceName ) = 0;
     virtual void SetUnderlined( bool underlined ) = 0;
     virtual void SetEncoding(wxFontEncoding encoding) = 0;
-    virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
+    void SetNativeFontInfo(const wxNativeFontInfo& info)
+        { DoSetNativeFontInfo(info); }
 
     void SetNativeFontInfo(const wxString& info);
     void SetNativeFontInfoUserDesc(const wxString& info);
@@ -195,7 +196,10 @@ protected:
     // get the internal data
     wxFontRefData *GetFontData() const
         { return (wxFontRefData *)m_refData; }
-    
+
+    // the function called by both overloads of SetNativeFontInfo()
+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+
 private:
     // the currently default encoding: by default, it's the default system
     // encoding, but may be changed by the application using
@@ -217,6 +221,8 @@ private:
     #include "wx/mgl/font.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/font.h"
 #elif defined(__WXPM__)
     #include "wx/os2/font.h"
 #endif