blind attempt to fix wxMac compilation (__UNIX__ defined on OS X?)

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 44758313e018f968ce8b7daff4ec1533d02eea23..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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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
 
     #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 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;
 
 
     virtual bool IsFixedWidth() const;
 


@@ -221,6 +221,8 @@ private:
     #include "wx/mgl/font.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
     #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
 #elif defined(__WXPM__)
     #include "wx/os2/font.h"
 #endif