Remove duplicate wxEmptyString declaration.

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

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 6fd46468d34f798a02b124e4499a5b922c367a51..ebb88d97b4e7adad0bbd819345944805736cd60e 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -12,10 +12,12 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 

-#ifdef __GNUG__
-    #pragma interface "font.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "font.h"

 #endif
 
 #endif
 

+class wxXFont;
+

 // Font
 class wxFont : public wxFontBase
 {
 // Font
 class wxFont : public wxFontBase
 {


@@ -25,12 +27,12 @@ public:
     wxFont(const wxFont& font) { Init(); Ref(font); }
 
     wxFont(int size,
     wxFont(const wxFont& font) { Init(); Ref(font); }
 
     wxFont(int size,

-           int family,
-           int style,
-           int weight,
-           bool underlined = FALSE,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+        int family,
+        int style,
+        int weight,
+        bool underlined = FALSE,
+        const wxString& face = wxEmptyString,
+        wxFontEncoding encoding = wxFONTENCODING_DEFAULT)

     {
         Init();
 
     {
         Init();
 


@@ -40,12 +42,17 @@ public:
     wxFont(const wxNativeFontInfo& info);
 
     bool Create(int size,
     wxFont(const wxNativeFontInfo& info);
 
     bool Create(int size,

-                int family,
-                int style,
-                int weight,
-                bool underlined = FALSE,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+        int family,
+        int style,
+        int weight,
+        bool underlined = FALSE,
+        const wxString& face = wxEmptyString,
+        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    // wxMOTIF-specific
+    bool Create(const wxString& fontname,
+        wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
+    bool Create(const wxNativeFontInfo& fontinfo);

 
     virtual ~wxFont();
 
 
     virtual ~wxFont();
 


@@ -60,6 +67,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() 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);


@@ -83,16 +91,24 @@ public:
     // of the fonts and a mapping file.
 
     // Return font struct, and optionally the Motif font list
     // of the fonts and a mapping file.
 
     // Return font struct, and optionally the Motif font list

-    class wxXFont* GetInternalFont(double scale = 1.0,
-                                   WXDisplay* display = NULL) const;
+    wxXFont *GetInternalFont(double scale = 1.0,
+        WXDisplay* display = NULL) const;

 
     // These two are helper functions for convenient access of the above.
     WXFontStructPtr GetFontStruct(double scale = 1.0,
 
     // These two are helper functions for convenient access of the above.
     WXFontStructPtr GetFontStruct(double scale = 1.0,

-                                  WXDisplay* display = NULL) const;
+        WXDisplay* display = NULL) const;

     WXFontList GetFontList(double scale = 1.0,
     WXFontList GetFontList(double scale = 1.0,

-                           WXDisplay* display = NULL) const;
-
+        WXDisplay* display = NULL) const;
+#if __WXMOTIF20__
+    WXRenderTable GetRenderTable(WXDisplay* display) const;
+#endif
+    // returns either a XmFontList or XmRendition, depending
+    // on Motif version
+    WXFontType GetFontType(WXDisplay* display) const;
+    static WXString GetFontTag();

 protected:
 protected:

+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 


@@ -105,4 +121,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-    // _WX_FONT_H_
+// _WX_FONT_H_