fixed bug with the caret positioning after SetValue() introduced by the last commit

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index becbfb1eeb27603cbade952ddcd2b20e7606f592..0a2bfbb095bfb56c0484a65f4d1dfb4bc921b3da 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -7,107 +7,108 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

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

-#pragma interface
+    #pragma interface

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"

 #include "wx/hash.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
-//-----------------------------------------------------------------------------

 
 

-//extern wxFontNameDirectory *wxTheFontNameDirectory;  // defined below
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxFont
 // wxFont

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

 
 

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

 {
 {

-  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 );
+public:
+    // ctors and such
+    wxFont() { Init(); }
+    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
+    wxFont(const wxString& fontname,
+           wxFontEncoding fontenc = wxFONTENCODING_DEFAULT)
+    {
+        Init();
+
+        Create(fontname, fontenc);
+    }
+
+    wxFont(const wxNativeFontInfo& info);
+
+    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);
+
+    // wxGTK-specific
+    bool Create(const wxString& fontname,
+                wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
+    bool Create(const wxNativeFontInfo& fontinfo);
+

     ~wxFont();
     ~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 );
-
-  // implementation
+
+    // assignment
+    wxFont& operator=(const wxFont& font);
+
+    // 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 wxNativeFontInfo *GetNativeFontInfo() 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);
+    virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
+
+    // implementation from now on
+    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();
-    ~wxFontNameDirectory();
-
-    void  Initialize();
-    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();
-    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__