Many plot window gooddies.

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 54e6d5da1512c563b21d85009160e5200ced0bb1..c3885bfa268c624b400b5d462aa65faf2f6f8474 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -14,11 +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"

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


@@ -30,12 +26,6 @@ class wxWindow;
 
 class wxFont;
 
 
 class wxFont;
 

-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-extern const wxChar* wxEmptyString;
-

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


@@ -46,6 +36,7 @@ public:
     // ctors and such
     wxFont() { Init(); }
     wxFont(const wxFont& font) { Init(); Ref(font); }
     // ctors and such
     wxFont() { Init(); }
     wxFont(const wxFont& font) { Init(); Ref(font); }

+    wxFont(const wxString& fontname, const wxFontData& fontdata);

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


@@ -91,7 +82,6 @@ public:
     virtual void SetEncoding(wxFontEncoding encoding);
 
     // implementation from now on
     virtual void SetEncoding(wxFontEncoding encoding);
 
     // 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;