Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 9234d3390c99c07994e48ea3758c2ee5ac770665..14a6533c724841bf51f64db50560def9593604d4 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -30,14 +30,18 @@ class wxPaintDC;
 class wxWindow;
 
 class wxFont;
+/*
 class wxFontNameDirectory;
+*/
 
 //-----------------------------------------------------------------------------
 // global variables
 //-----------------------------------------------------------------------------
 
+/*
 extern wxFontNameDirectory *wxTheFontNameDirectory;
-extern const char* wxEmptyString;
+*/
+extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxFont
@@ -54,13 +58,12 @@ 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;
   int GetFamily() const;
-  int GetFontId() const;
   int GetStyle() const;
   int GetWeight() const;
   bool GetUnderlined() const;
@@ -79,7 +82,7 @@ public:
     
   // implementation
   
-  wxFont( char *xFontName );
+  wxFont( GdkFont* font, char *xFontName );
   void Unshare();
 
   GdkFont* GetInternalFont(float scale = 1.0) const;
@@ -87,6 +90,7 @@ public:
   // no data :-)
 };
 
+/*
 //-----------------------------------------------------------------------------
 // wxFontDirectory
 //-----------------------------------------------------------------------------
@@ -114,5 +118,6 @@ class wxFontNameDirectory: public wxObject
     class wxHashTable *table;
     int   nextFontId;
 };
+*/
 
 #endif // __GTKFONTH__