A bit more DnD and clipbrd updates

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index bb928ffa7499b308fdbbf99c6b230289f137e09c..becbfb1eeb27603cbade952ddcd2b20e7606f592 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -2,10 +2,9 @@
 // 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
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -43,45 +42,40 @@ class wxFontNameDirectory;
 // wxFont
 //-----------------------------------------------------------------------------
 
-class wxFont: public wxGDIObject 
+class wxFont: public wxGDIObject
 {
   DECLARE_DYNAMIC_CLASS(wxFont)
-  
+
   public:
-    wxFont(void);
+    wxFont();
     wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight,
-          bool underlined = FALSE, const char *Face=NULL );
-    wxFont( int PointSize, const char *Face, int Family, int Style, int Weight, 
-          bool underlined = FALSE );
+            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( const wxFont* font );
-    ~wxFont(void);
+    ~wxFont();
     wxFont& operator = ( const wxFont& font );
     bool operator == ( const wxFont& font );
     bool operator != ( const wxFont& font );
-    bool Ok();
-
-    int GetPointSize(void) const;
-    wxString GetFaceName(void) const;
-    int GetFamily(void) const;
-    wxString GetFamilyString(void) const;
-    int GetFontId(void) const;
-    wxString GetFaceString(void) const;
-    int GetStyle(void) const;
-    wxString GetStyleString(void) const;
-    int GetWeight(void) const;
-    wxString GetWeightString(void) const;
-    bool GetUnderlined(void) const;
+    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 );
-    
-  private:
-  
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxWindow;
-    
-    GdkFont* GetInternalFont(float scale = 1.0);
+
+  // implementation
+
+    GdkFont* GetInternalFont(float scale = 1.0) const;
 
     // no data :-)
 };
@@ -90,15 +84,15 @@ class wxFont: public wxGDIObject
 // wxFontDirectory
 //-----------------------------------------------------------------------------
 
-class wxFontNameDirectory: public wxObject 
+class wxFontNameDirectory: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxFontNameDirectory)
-  
+
   public:
-    wxFontNameDirectory(void);
+    wxFontNameDirectory();
     ~wxFontNameDirectory();
 
-    void  Initialize(void);
+    void  Initialize();
     void  Initialize(int fontid, int family, const char *name);
 
     int   FindOrCreateFontId(const char *name, int family);
@@ -106,11 +100,10 @@ class wxFontNameDirectory: public wxObject
     int   GetFamily(int fontid);
     int   GetFontId(const char *name);
     char* GetFontName(int fontid);
-    int   GetNewFontId(void);
+    int   GetNewFontId();
     char* GetPostScriptName(int fontid, int weight, int style);
     char* GetScreenName(int fontid, int weight, int style);
-    
-    
+
     class wxHashTable *table;
     int   nextFontId;
 };