added __WXBASE__ define; removed duplicated (in wx/chkconf.h) compatibility section

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

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 0fba84773103d251903ada4efee0a69ba0b3d35e..93ae30121f18a78e2c2470a20d1c4b769f8fca06 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -6,7 +6,7 @@
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // General note: this header is private to wxWindows and is not supposed to be
 /////////////////////////////////////////////////////////////////////////////
 
 // General note: this header is private to wxWindows and is not supposed to be


@@ -16,7 +16,7 @@
 #ifndef _WX_FONTUTIL_H_
 #define _WX_FONTUTIL_H_
 
 #ifndef _WX_FONTUTIL_H_
 #define _WX_FONTUTIL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "fontutil.h"
 #endif
 
     #pragma interface "fontutil.h"
 #endif
 


@@ -72,7 +72,9 @@ enum wxXLFDField
 //     further it might make sense to make it a real class with virtual methods
 struct WXDLLEXPORT wxNativeFontInfo
 {
 //     further it might make sense to make it a real class with virtual methods
 struct WXDLLEXPORT wxNativeFontInfo
 {

-#if defined(_WX_X_FONTLIKE)
+#if wxUSE_PANGO
+    PangoFontDescription *description;
+#elif defined(_WX_X_FONTLIKE)

     // the members can't be accessed directly as we only parse the
     // xFontName on demand
 private:
     // the members can't be accessed directly as we only parse the
     // xFontName on demand
 private: