Set/GetTitle out of wxWindowBase, forked and put to gtk/window.h and mgl/window.h...

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

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 906bc2462a681ca114a3c58b11f278aec8677436..1f086068cf9152cdd38442a55d6a00c2e88522a9 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -16,6 +16,8 @@
     #pragma interface "font.h"
 #endif
 
     #pragma interface "font.h"
 #endif
 

+class wxXFont;
+

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


@@ -37,6 +39,8 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 

+    wxFont(const wxNativeFontInfo& info);
+

     bool Create(int size,
                 int family,
                 int style,
     bool Create(int size,
                 int family,
                 int style,


@@ -81,8 +85,8 @@ 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,