Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 70e594cc9b4d897eeb69ce74bf85f3261c0044ec..14a6533c724841bf51f64db50560def9593604d4 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -58,8 +58,8 @@ public:
   wxFont( const wxFont& font );
   ~wxFont();
   wxFont& operator = ( const wxFont& font );
   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;
   bool Ok() const;
 
   int GetPointSize() const;


@@ -82,7 +82,7 @@ public:
     
   // implementation
   
     
   // implementation
   

-  wxFont( char *xFontName );
+  wxFont( GdkFont* font, char *xFontName );

   void Unshare();
 
   GdkFont* GetInternalFont(float scale = 1.0) const;
   void Unshare();
 
   GdkFont* GetInternalFont(float scale = 1.0) const;