Changed wxRectangle to wxRect. Sorry for the bandwidth...

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 619813b17ed4da4f47474385a29eb476b38401bc..bd34c917910bdb7227525eaccbf1b50bd329b791 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -2,8 +2,7 @@
 // Name:        font.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,7 +36,7 @@ class wxFontNameDirectory;
 // global variables
 //-----------------------------------------------------------------------------
 
-// extern wxFontNameDirectory wxTheFontNameDirectory;  // defined below
+//extern wxFontNameDirectory *wxTheFontNameDirectory;  // defined below
 
 //-----------------------------------------------------------------------------
 // wxFont
@@ -50,7 +49,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 +58,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 +73,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 +110,6 @@ class wxFontNameDirectory: public wxObject
     int   nextFontId;
 };
 
-extern wxFontNameDirectory wxTheFontNameDirectory;
+extern wxFontNameDirectory *wxTheFontNameDirectory;
 
 #endif // __GTKFONTH__