1. wxTextCtrl::SetBackgroundColour() now works

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index bb928ffa7499b308fdbbf99c6b230289f137e09c..70e82bedb8a0c48fc12eda1bbf4833c3cc151529 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -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 :-)
 };