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 9f7cb9b92b54b715e84001daec2a3c751f3e9c17..0a2bfbb095bfb56c0484a65f4d1dfb4bc921b3da 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -14,17 +14,7 @@
     #pragma interface
 #endif
 
     #pragma interface
 #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"
-
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-#define wxUSE_FONTNAMEDIRECTORY 0

 
 // ----------------------------------------------------------------------------
 // classes
 
 // ----------------------------------------------------------------------------
 // classes


@@ -36,20 +26,6 @@ class wxWindow;
 
 class wxFont;
 
 
 class wxFont;
 

-#if wxUSE_FONTNAMEDIRECTORY
-    class wxFontNameDirectory;
-#endif
-
-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-extern const wxChar* wxEmptyString;
-
-#if wxUSE_FONTNAMEDIRECTORY
-    extern wxFontNameDirectory *wxTheFontNameDirectory;
-#endif
-

 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------


@@ -59,10 +35,16 @@ class wxFont : public wxFontBase
 public:
     // ctors and such
     wxFont() { Init(); }
 public:
     // ctors and such
     wxFont() { Init(); }

-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
+    wxFont(const wxString& fontname,
+           wxFontEncoding fontenc = wxFONTENCODING_DEFAULT)
+    {
+        Init();

 
 

-    // assignment
-    wxFont& operator=(const wxFont& font);
+        Create(fontname, fontenc);
+    }
+
+    wxFont(const wxNativeFontInfo& info);

 
     wxFont(int size,
            int family,
 
     wxFont(int size,
            int family,


@@ -85,8 +67,16 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                 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();
 

+    // assignment
+    wxFont& operator=(const wxFont& font);
+

     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;


@@ -95,6 +85,7 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() 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 SetPointSize( int pointSize );
     virtual void SetFamily( int family );


@@ -103,9 +94,9 @@ public:
     virtual void SetFaceName( const wxString& faceName );
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
     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
 
     // implementation from now on

-    wxFont( GdkFont* font, char *xFontName );

     void Unshare();
 
     GdkFont* GetInternalFont(float scale = 1.0) const;
     void Unshare();
 
     GdkFont* GetInternalFont(float scale = 1.0) const;


@@ -120,36 +111,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 

-#if wxUSE_FONTNAMEDIRECTORY
-
-// ----------------------------------------------------------------------------
-// wxFontDirectory
-// ----------------------------------------------------------------------------
-
-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;
-};
-
-#endif // wxUSE_FONTNAMEDIRECTORY
-

 #endif // __GTKFONTH__
 #endif // __GTKFONTH__