X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36b3b54ad8431bca0fa53fa8acae5ba6d4c3e9c7..ab20a9a95a8bbed75bfc6ecba20f013eb9dcff46:/include/wx/gtk/font.h diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 7e27d54e1a..14a6533c72 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -41,7 +41,7 @@ class wxFontNameDirectory; /* extern wxFontNameDirectory *wxTheFontNameDirectory; */ -extern const char* wxEmptyString; +extern const wxChar* wxEmptyString; //----------------------------------------------------------------------------- // wxFont @@ -58,8 +58,8 @@ public: 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; @@ -82,7 +82,7 @@ public: // implementation - wxFont( char *xFontName ); + wxFont( GdkFont* font, char *xFontName ); void Unshare(); GdkFont* GetInternalFont(float scale = 1.0) const;