Applied patch which allows you to detach a stream

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index e20075f1ebd538ded02fc7be4a2ebaa113f52400..4ad4c115266473d6a3772517a4bbd008a1e220a8 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:


@@ -12,11 +12,7 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "font.h"
-#endif
-
-#include <wx/gdicmn.h>
+#include "wx/gdicmn.h"

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


@@ -26,8 +22,7 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

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

 
     wxFont(int size,
            int family,
 
     wxFont(int size,
            int family,


@@ -37,10 +32,7 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

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

     }
 
     wxFont(const wxSize& pixelSize,
     }
 
     wxFont(const wxSize& pixelSize,


@@ -51,37 +43,48 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
-
-        (void)Create(0, pixelSize, TRUE, family, style, weight, underlined,
-                     face, encoding);
+        (void)Create(pixelSize, family, style, weight,
+                     underlined, face, encoding);

     }
 
     wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
     {
     }
 
     wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
     {

-        Init();
-

         Create(info, hFont);
     }
 
     wxFont(const wxString& fontDesc);
 
     bool Create(int size,
         Create(info, hFont);
     }
 
     wxFont(const wxString& fontDesc);
 
     bool Create(int size,

-                const wxSize& pixelSize,
-                bool sizeUsingPixels,

                 int family,
                 int style,
                 int weight,
                 bool underlined = false,
                 const wxString& face = wxEmptyString,
                 int family,
                 int style,
                 int weight,
                 bool underlined = false,
                 const wxString& face = wxEmptyString,

-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        return DoCreate(size, wxDefaultSize, false, family, style,
+                        weight, underlined, face, encoding);
+    }
+
+    bool Create(const wxSize& pixelSize,
+                int family,
+                int style,
+                int weight,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        return DoCreate(-1, pixelSize, true, family, style,
+                        weight, underlined, face, encoding);
+    }

 
     bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 
     virtual ~wxFont();
 
 
     bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 
     virtual ~wxFont();
 

-    // assignment
-    wxFont& operator=(const wxFont& font);
+    // wxFontBase overridden functions
+    virtual wxString GetNativeFontInfoDesc() const;
+    virtual wxString GetNativeFontInfoUserDesc() const;

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


@@ -100,7 +103,7 @@ public:
     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);

-    virtual void SetFaceName(const wxString& faceName);
+    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);
 


@@ -123,10 +126,18 @@ public:
      */
 
 protected:
      */
 
 protected:

-    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+    // real font creation function, used in all cases
+    bool DoCreate(int size,
+                  const wxSize& pixelSize,
+                  bool sizeUsingPixels,
+                  int family,
+                  int style,
+                  int weight,
+                  bool underlined = false,
+                  const wxString& face = wxEmptyString,
+                  wxFontEncoding encoding = wxFONTENCODING_DEFAULT);

 
 

-    // common part of all ctors
-    void Init();
+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);

 
     void Unshare();
 
 
     void Unshare();
 


@@ -134,5 +145,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 

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