switched to using wxPopupWindow

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

diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index a0850cd38fdd7ba49845ee6b5c30b07a1c9860e5..d2ee13045a7ec862eb07a11edfbfe6569c684bcc 100644 (file)
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 

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

 #pragma interface "font.h"
 #endif
 
 #pragma interface "font.h"
 #endif
 


@@ -71,7 +71,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;

-    virtual wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;

 
     virtual bool IsFixedWidth() const;
 
 
     virtual bool IsFixedWidth() const;
 


@@ -84,7 +84,7 @@ public:
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetNoAntiAliasing( bool no = TRUE );
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetNoAntiAliasing( bool no = TRUE );

-    virtual bool GetNoAntiAliasing();
+    virtual bool GetNoAntiAliasing() const ;

 
     // Implementation
 
 
     // Implementation