no message

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 619813b17ed4da4f47474385a29eb476b38401bc..70e82bedb8a0c48fc12eda1bbf4833c3cc151529 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -37,7 +37,7 @@ class wxFontNameDirectory;
 // global variables
 //-----------------------------------------------------------------------------
 
-// extern wxFontNameDirectory wxTheFontNameDirectory;  // defined below
+//extern wxFontNameDirectory *wxTheFontNameDirectory;  // defined below
 
 //-----------------------------------------------------------------------------
 // wxFont
@@ -50,7 +50,7 @@ class wxFont: public wxGDIObject
   public:
     wxFont(void);
     wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight,
-          bool underlined = FALSE, const char *Face=NULL );
+          bool underlined = FALSE, const char *Face= ( const char *) NULL );
     wxFont( int PointSize, const char *Face, int Family, int Style, int Weight, 
           bool underlined = FALSE );
     wxFont( const wxFont& font );
@@ -59,7 +59,7 @@ class wxFont: public wxGDIObject
     wxFont& operator = ( const wxFont& font );
     bool operator == ( const wxFont& font );
     bool operator != ( const wxFont& font );
-    bool Ok();
+    bool Ok() const;
 
     int GetPointSize(void) const;
     wxString GetFaceName(void) const;
@@ -74,14 +74,10 @@ class wxFont: public wxGDIObject
     bool GetUnderlined(void) const;
 
     wxFont( char *xFontName );
+
+  // implementation        
     
-  private:
-  
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxWindow;
-    
-    GdkFont* GetInternalFont(float scale = 1.0);
+    GdkFont* GetInternalFont(float scale = 1.0) const;
 
     // no data :-)
 };
@@ -115,6 +111,6 @@ class wxFontNameDirectory: public wxObject
     int   nextFontId;
 };
 
-extern wxFontNameDirectory wxTheFontNameDirectory;
+extern wxFontNameDirectory *wxTheFontNameDirectory;
 
 #endif // __GTKFONTH__