another wxUSE_DRAG_AND_DROP==0 compilation fix

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 01e7a41c76ab8be2dfa89b9d511373fc5e7e6c15..a88eee26065849f73114c8f3b3c66c89c90a1446 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,21 +12,19 @@
 #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"

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

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

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

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

 
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0

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


@@ -35,12 +33,34 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

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

 
 

-        (void)Create(size, wxSize(0, 0), FALSE, family, style, weight,
-                     underlined, face, encoding);
+    wxFont(int size,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Create(size, family, style, weight, underlined, face, encoding);

     }
 
     }
 

+    bool Create(int size,
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        return DoCreate(size, wxDefaultSize, false, family, style,
+                        weight, underlined, face, encoding);
+    }
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0

     wxFont(const wxSize& pixelSize,
            int family,
            int style,
     wxFont(const wxSize& pixelSize,
            int family,
            int style,


@@ -49,45 +69,58 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
+        (void)Create(pixelSize, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight,
+                     underlined, face, encoding);
+    }
+#endif

 
 

-        (void)Create(0, pixelSize, TRUE, family, style, weight, underlined,
-                     face, encoding);
+    wxFont(const wxSize& pixelSize,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        (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);
 
         Create(info, hFont);
     }
 
     wxFont(const wxString& fontDesc);
 

-    bool Create(int size,
-                const wxSize& pixelSize,
-                bool sizeUsingPixels,
-                int family,
-                int style,
-                int weight,
+
+    bool Create(const wxSize& pixelSize,
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,

                 bool underlined = false,
                 const wxString& face = wxEmptyString,
                 bool underlined = false,
                 const wxString& face = wxEmptyString,

-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+                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;
     virtual wxSize GetPixelSize() const;
     virtual bool IsUsingSizeInPixels() 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 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;


@@ -95,13 +128,15 @@ public:
 
     virtual void SetPointSize(int pointSize);
     virtual void SetPixelSize(const wxSize& pixelSize);
 
     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 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_COMPAT_SETTERS
+

     virtual bool IsFixedWidth() const;
 
     // implementation only from now on
     virtual bool IsFixedWidth() const;
 
     // implementation only from now on


@@ -115,22 +150,26 @@ public:
     // for consistency with other wxMSW classes
     WXHFONT GetHFONT() const;
 
     // for consistency with other wxMSW classes
     WXHFONT GetHFONT() const;
 

-    /*
-       virtual bool UseResource();
-       virtual bool ReleaseResource();
-     */
-

 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,
+                  wxFontFamily family,
+                  wxFontStyle style,
+                  wxFontWeight 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();
+    // implement wxObject virtuals which are used by AllocExclusive()
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

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

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