Added defines to allow altered tab placement under gcc-2.95

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index becbfb1eeb27603cbade952ddcd2b20e7606f592..14a6533c724841bf51f64db50560def9593604d4 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -30,13 +30,18 @@ class wxPaintDC;
 class wxWindow;
 
 class wxFont;
+/*
 class wxFontNameDirectory;
+*/
 
 //-----------------------------------------------------------------------------
 // global variables
 //-----------------------------------------------------------------------------
 
-//extern wxFontNameDirectory *wxTheFontNameDirectory;  // defined below
+/*
+extern wxFontNameDirectory *wxTheFontNameDirectory;
+*/
+extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxFont
@@ -46,40 +51,46 @@ class wxFont: public wxGDIObject
 {
   DECLARE_DYNAMIC_CLASS(wxFont)
 
-  public:
-    wxFont();
-    wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight,
-            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 );
-    ~wxFont();
-    wxFont& operator = ( const wxFont& font );
-    bool operator == ( const wxFont& font );
-    bool operator != ( const wxFont& font );
-    bool Ok() const;
-
-    int GetPointSize() const;
-    wxString GetFaceName() const;
-    int GetFamily() const;
-    wxString GetFamilyString() const;
-    int GetFontId() const;
-    wxString GetFaceString() const;
-    int GetStyle() const;
-    wxString GetStyleString() const;
-    int GetWeight() const;
-    wxString GetWeightString() const;
-    bool GetUnderlined() const;
-
-    wxFont( char *xFontName );
-
+public:
+  wxFont();
+  wxFont( int pointSize, int family, int style, int weight, bool underlined = FALSE, 
+          const wxString& face = wxEmptyString );
+  wxFont( const wxFont& font );
+  ~wxFont();
+  wxFont& operator = ( const wxFont& font );
+  bool operator == ( const wxFont& font ) const;
+  bool operator != ( const wxFont& font ) const;
+  bool Ok() const;
+
+  int GetPointSize() const;
+  int GetFamily() const;
+  int GetStyle() const;
+  int GetWeight() const;
+  bool GetUnderlined() const;
+
+  void SetPointSize( int pointSize );
+  void SetFamily( int family );
+  void SetStyle( int style );
+  void SetWeight( int weight );
+  void SetFaceName( const wxString& faceName );
+  void SetUnderlined( bool underlined );
+    
+  wxString GetFaceName() const;
+  wxString GetFamilyString() const;
+  wxString GetStyleString() const;
+  wxString GetWeightString() const;
+    
   // implementation
+  
+  wxFont( GdkFont* font, char *xFontName );
+  void Unshare();
 
-    GdkFont* GetInternalFont(float scale = 1.0) const;
+  GdkFont* GetInternalFont(float scale = 1.0) const;
 
-    // no data :-)
+  // no data :-)
 };
 
+/*
 //-----------------------------------------------------------------------------
 // wxFontDirectory
 //-----------------------------------------------------------------------------
@@ -107,7 +118,6 @@ class wxFontNameDirectory: public wxObject
     class wxHashTable *table;
     int   nextFontId;
 };
-
-extern wxFontNameDirectory *wxTheFontNameDirectory;
+*/
 
 #endif // __GTKFONTH__