wxGTK::wxSpinCtrl API synchronised with wxMSW

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index a1ce86dfe03f9f5653d6e75f60e51b76e27a0d04..54e6d5da1512c563b21d85009160e5200ced0bb1 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -2,18 +2,16 @@
 // Name:        font.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        font.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
 #ifdef __GNUG__
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
 #ifdef __GNUG__

-#pragma interface
+    #pragma interface

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -22,99 +20,90 @@
 #include "wx/hash.h"
 #include "wx/gdiobj.h"
 
 #include "wx/hash.h"
 #include "wx/gdiobj.h"
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // classes
 // classes

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 class wxDC;
 class wxPaintDC;
 class wxWindow;
 
 class wxFont;
 
 class wxDC;
 class wxPaintDC;
 class wxWindow;
 
 class wxFont;

-class wxFontNameDirectory;

 
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // global variables
 // global variables

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-//extern wxFontNameDirectory *wxTheFontNameDirectory;  // defined below
+extern const wxChar* wxEmptyString;

 
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxFont
 // wxFont

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxFont: public wxGDIObject 
+class wxFont : public wxFontBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxFont)
-  
-  public:
-    wxFont(void);
-    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( const wxFont* font );
-    ~wxFont(void);
-    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;
-
-    wxFont( char *xFontName );
-    
-  private:
-  
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxWindow;
-    
+public:
+    // ctors and such
+    wxFont() { Init(); }
+    wxFont(const wxFont& font) { Init(); Ref(font); }
+
+    // assignment
+    wxFont& operator=(const wxFont& font);
+
+    wxFont(int size,
+           int family,
+           int style,
+           int weight,
+           bool underlined = FALSE,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Init();
+
+        (void)Create(size, family, style, weight, underlined, face, encoding);
+    }
+
+    bool Create(int size,
+                int family,
+                int style,
+                int weight,
+                bool underlined = FALSE,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    ~wxFont();
+
+    // implement base class pure virtuals
+    virtual int GetPointSize() const;
+    virtual int GetFamily() const;
+    virtual int GetStyle() const;
+    virtual int GetWeight() const;
+    virtual wxString GetFaceName() const;
+    virtual bool GetUnderlined() const;
+    virtual wxFontEncoding GetEncoding() const;
+
+    virtual void SetPointSize( int pointSize );
+    virtual void SetFamily( int family );
+    virtual void SetStyle( int style );
+    virtual void SetWeight( int weight );
+    virtual void SetFaceName( const wxString& faceName );
+    virtual void SetUnderlined( bool underlined );
+    virtual void SetEncoding(wxFontEncoding encoding);
+
+    // implementation from now on
+    wxFont( GdkFont* font, char *xFontName );
+    void Unshare();
+

     GdkFont* GetInternalFont(float scale = 1.0) const;
 
     // no data :-)
     GdkFont* GetInternalFont(float scale = 1.0) const;
 
     // no data :-)

-};

 
 

-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
+protected:
+    // common part of all ctors
+    void Init();

 
 

-class wxFontNameDirectory: public wxObject 
-{
-  DECLARE_DYNAMIC_CLASS(wxFontNameDirectory)
-  
-  public:
-    wxFontNameDirectory(void);
-    ~wxFontNameDirectory();
-
-    void  Initialize(void);
-    void  Initialize(int fontid, int family, const char *name);
-
-    int   FindOrCreateFontId(const char *name, int family);
-    char* GetAFMName(int fontid, int weight, int style);
-    int   GetFamily(int fontid);
-    int   GetFontId(const char *name);
-    char* GetFontName(int fontid);
-    int   GetNewFontId(void);
-    char* GetPostScriptName(int fontid, int weight, int style);
-    char* GetScreenName(int fontid, int weight, int style);
-    
-    
-    class wxHashTable *table;
-    int   nextFontId;
+private:
+    DECLARE_DYNAMIC_CLASS(wxFont)

 };
 
 };
 

-extern wxFontNameDirectory *wxTheFontNameDirectory;
-

 #endif // __GTKFONTH__
 #endif // __GTKFONTH__