doc-typo

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 47454c69e9bd8695587d3aae089959b56a5d68ef..e20075f1ebd538ded02fc7be4a2ebaa113f52400 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -12,10 +12,12 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "font.h"
 #endif
 
     #pragma interface "font.h"
 #endif
 

+#include <wx/gdicmn.h>
+

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


@@ -25,39 +27,56 @@ class WXDLLEXPORT wxFont : public wxFontBase
 public:
     // ctors and such
     wxFont() { Init(); }
 public:
     // ctors and such
     wxFont() { Init(); }

-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont(const wxFont& font) : wxFontBase(font) { Init(); Ref(font); }

 
     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)
     {
         Init();
 
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
         Init();
 

-        (void)Create(size, family, style, weight, underlined, face, encoding);
+        (void)Create(size, wxSize(0, 0), FALSE, family, style, weight,
+                     underlined, face, encoding);

     }
 
     }
 

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

     {
         Init();
 
     {
         Init();
 

-        Create(info);
+        (void)Create(0, pixelSize, TRUE, 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,
     }
 
     wxFont(const wxString& fontDesc);
 
     bool Create(int size,

+                const wxSize& pixelSize,
+                bool sizeUsingPixels,

                 int family,
                 int style,
                 int weight,
                 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);
 

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

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


@@ -66,14 +85,18 @@ public:
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;

+    virtual wxSize GetPixelSize() const;
+    virtual bool IsUsingSizeInPixels() const;

     virtual int GetFamily() const;
     virtual int GetStyle() const;
     virtual int GetWeight() const;
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual int GetFamily() const;
     virtual int GetStyle() const;
     virtual int GetWeight() 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 SetPixelSize(const wxSize& pixelSize);

     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);


@@ -81,17 +104,17 @@ 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 bool FreeResource(bool force = FALSE);
+    virtual WXHANDLE GetResourceHandle() const;
+    virtual bool FreeResource(bool force = false);

 
 

-    // for consistency with other wxMSW classes and to have a const
-    // GetResourceHandle()-like function we have a synonym for it
+    // for consistency with other wxMSW classes

     WXHFONT GetHFONT() const;
 
     /*
     WXHFONT GetHFONT() const;
 
     /*


@@ -100,6 +123,8 @@ public:
      */
 
 protected:
      */
 
 protected:

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

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