Added defines to allow altered tab placement under gcc-2.95

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 7e27d54e1ac42ccd8847182f01dfdadc096ddce8..14a6533c724841bf51f64db50560def9593604d4 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -41,7 +41,7 @@ class wxFontNameDirectory;
 /*
 extern wxFontNameDirectory *wxTheFontNameDirectory;
 */
-extern const char* wxEmptyString;
+extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxFont
@@ -58,8 +58,8 @@ public:
   wxFont( const wxFont& font );
   ~wxFont();
   wxFont& operator = ( const wxFont& font );
-  bool operator == ( const wxFont& font );
-  bool operator != ( const wxFont& font );
+  bool operator == ( const wxFont& font ) const;
+  bool operator != ( const wxFont& font ) const;
   bool Ok() const;
 
   int GetPointSize() const;
@@ -82,7 +82,7 @@ public:
     
   // implementation
   
-  wxFont( char *xFontName );
+  wxFont( GdkFont* font, char *xFontName );
   void Unshare();
 
   GdkFont* GetInternalFont(float scale = 1.0) const;