Small tweaks for WinCE compatibility

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 36642fd4149e58c8de2ccf8122c02df635ce9b37..b1d31e2fb1406572fc81dd3d646171c7136565fe 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

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


@@ -16,10 +16,6 @@
     #pragma interface "font.h"
 #endif
 
     #pragma interface "font.h"
 #endif
 

-#include "wx/gdiobj.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-

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


@@ -44,6 +40,15 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 

+    wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+    {
+        Init();
+
+        Create(info, hFont);
+    }
+
+    wxFont(const wxString& fontDesc);
+

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


@@ -52,8 +57,13 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 

+    bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
+

     virtual ~wxFont();
 
     virtual ~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;


@@ -62,6 +72,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);


@@ -71,20 +82,27 @@ public:
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 

+    virtual bool IsFixedWidth() const;
+

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    int GetFontId() const;

     virtual bool IsFree() const;
     virtual bool RealizeResource();
     virtual bool IsFree() const;
     virtual bool RealizeResource();

-    virtual WXHANDLE GetResourceHandle();
+    virtual WXHANDLE GetResourceHandle() const;

     virtual bool FreeResource(bool force = FALSE);
     virtual bool FreeResource(bool force = FALSE);

+
+    // for consistency with other wxMSW classes
+    WXHFONT GetHFONT() const;
+

     /*
        virtual bool UseResource();
        virtual bool ReleaseResource();
      */
 
 protected:
     /*
        virtual bool UseResource();
        virtual bool ReleaseResource();
      */
 
 protected:

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

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