Unicode fixes.

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 9234d3390c99c07994e48ea3758c2ee5ac770665..70e594cc9b4d897eeb69ce74bf85f3261c0044ec 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 wxWindow;
 
 class wxFont;

+/*

 class wxFontNameDirectory;
 class wxFontNameDirectory;

+*/

 
 //-----------------------------------------------------------------------------
 // global variables
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global variables
 //-----------------------------------------------------------------------------
 

+/*

 extern wxFontNameDirectory *wxTheFontNameDirectory;
 extern wxFontNameDirectory *wxTheFontNameDirectory;

-extern const char* wxEmptyString;
+*/
+extern const wxChar* wxEmptyString;

 
 //-----------------------------------------------------------------------------
 // wxFont
 
 //-----------------------------------------------------------------------------
 // wxFont


@@ -60,7 +64,6 @@ public:
 
   int GetPointSize() const;
   int GetFamily() const;
 
   int GetPointSize() const;
   int GetFamily() const;

-  int GetFontId() const;

   int GetStyle() const;
   int GetWeight() const;
   bool GetUnderlined() const;
   int GetStyle() const;
   int GetWeight() const;
   bool GetUnderlined() const;


@@ -87,6 +90,7 @@ public:
   // no data :-)
 };
 
   // no data :-)
 };
 

+/*

 //-----------------------------------------------------------------------------
 // wxFontDirectory
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxFontDirectory
 //-----------------------------------------------------------------------------


@@ -114,5 +118,6 @@ class wxFontNameDirectory: public wxObject
     class wxHashTable *table;
     int   nextFontId;
 };
     class wxHashTable *table;
     int   nextFontId;
 };

+*/

 
 #endif // __GTKFONTH__
 
 #endif // __GTKFONTH__