fixing 'main screen'

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

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index d6aeb9e1bfe80bd40db8a7513cec499b0e228e3e..53f0c3a4d5bc47c72e1e26bbce7c76e6b91cae2d 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -1,80 +1,106 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.h
+// Name:        wx/motif/font.h

 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 

-#ifdef __GNUG__
-    #pragma interface "font.h"
+#if __WXMOTIF20__ && !__WXLESSTIF__
+    #define wxMOTIF_USE_RENDER_TABLE 1
+#else
+    #define wxMOTIF_USE_RENDER_TABLE 0

 #endif
 #endif

+#define wxMOTIF_NEW_FONT_HANDLING wxMOTIF_USE_RENDER_TABLE
+
+class wxXFont;

 
 // Font
 
 // Font

-class wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont() { }
+
+    wxFont(const wxNativeFontInfo& info);

 
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0

     wxFont(int size,
            int family,
            int style,
            int weight,
     wxFont(int size,
            int family,
            int style,
            int weight,

-           bool underlined = FALSE,
+           bool underlined = false,

            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
-
-        (void)Create(size, family, style, weight, underlined, face, encoding);
+        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);

     }
     }

+#endif

 
 

-    wxFont(const wxNativeFontInfo& info)
+    wxFont(int size,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)

     {
     {

-        Init();
+        Create(size, family, style, weight, underlined, face, encoding);
+    }

 
 

-        (void)Create(info.pointSize, info.family, info.style, info.weight,
-                     info.underlined, info.faceName, info.encoding);
+    wxFont(const wxSize& pixelSize,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Create(10, family, style, weight, underlined, face, encoding);
+        SetPixelSize(pixelSize);

     }
 
     bool Create(int size,
     }
 
     bool Create(int size,

-                int family,
-                int style,
-                int weight,
-                bool underlined = FALSE,
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,
+                bool underlined = false,

                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 

-    virtual ~wxFont();
+    // wxMOTIF-specific
+    bool Create(const wxString& fontname,
+        wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
+    bool Create(const wxNativeFontInfo& fontinfo);

 
 

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

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

-    virtual int GetFamily() const;
-    virtual int GetStyle() const;
-    virtual int GetWeight() const;
+    virtual wxFontFamily GetFamily() const;
+    virtual wxFontStyle GetStyle() const;
+    virtual wxFontWeight GetWeight() const;

     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 const wxNativeFontInfo *GetNativeFontInfo() const;

 
     virtual void SetPointSize(int pointSize);
 
     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 SetFamily(wxFontFamily family);
+    virtual void SetStyle(wxFontStyle style);
+    virtual void SetWeight(wxFontWeight weight);
+    virtual bool SetFaceName(const wxString& faceName);

     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 

+    wxDECLARE_COMMON_FONT_METHODS();
+

     // Implementation
 
     // Find an existing, or create a new, XFontStruct
     // Implementation
 
     // Find an existing, or create a new, XFontStruct


@@ -89,26 +115,36 @@ 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.
 
     // These two are helper functions for convenient access of the above.

+#if wxMOTIF_USE_RENDER_TABLE
+    WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
+    WXRenderTable GetRenderTable(WXDisplay* display) const;
+#else // if !wxMOTIF_USE_RENDER_TABLE

     WXFontStructPtr GetFontStruct(double scale = 1.0,
     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;
+#endif // !wxMOTIF_USE_RENDER_TABLE
+    // returns either a XmFontList or XmRenderTable, depending
+    // on Motif version
+    WXFontType GetFontType(WXDisplay* display) const;
+    // like the function above but does a copy for XmFontList
+    WXFontType GetFontTypeC(WXDisplay* display) const;
+    static WXString GetFontTag();

 
 protected:
 
 protected:

-    // common part of all ctors
-    void Init();
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );

 
 

-    // VZ: IMHO, we don't need it at all...
-    bool RealizeResource() { return TRUE; }

     void Unshare();
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
     void Unshare();
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 

-#endif
-    // _WX_FONT_H_
+#endif // _WX_FONT_H_