correct positioning of the control and removed workarounds for old MSW bugs

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

diff --git a/include/wx/font.h b/include/wx/font.h
index e79e04e91c8bebca9f474b9677ae61f010526f30..c97ea06194ee35cef6b1d493f97c165a48811042 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -19,6 +19,7 @@
 #include "wx/defs.h"        // for wxDEFAULT &c
 #include "wx/fontenc.h"     // the font encoding constants
 #include "wx/gdiobj.h"      // the base class
 #include "wx/defs.h"        // for wxDEFAULT &c
 #include "wx/fontenc.h"     // the font encoding constants
 #include "wx/gdiobj.h"      // the base class

+#include "wx/gdicmn.h"      // for wxGDIObjListBase

 
 // ----------------------------------------------------------------------------
 // forward declarations
 
 // ----------------------------------------------------------------------------
 // forward declarations


@@ -107,7 +108,7 @@ enum
 
 class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
 
 
 class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
 

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

 {
 public:
     // creator function
 {
 public:
     // creator function


@@ -259,13 +260,23 @@ public:
                              bool underline = false,
                              const wxString& face = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
                              bool underline = false,
                              const wxString& face = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);

+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+     wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
+                              bool underline = false,
+                              const wxString& face = wxEmptyString,
+                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+        { return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style,
+                                  (wxFontWeight)weight, underline, face, encoding); }
+#endif
+

 #if WXWIN_COMPATIBILITY_2_6
     wxDEPRECATED( void AddFont(wxFont*) );
     wxDEPRECATED( void RemoveFont(wxFont*) );
 #endif
 };
 
 #if WXWIN_COMPATIBILITY_2_6
     wxDEPRECATED( void AddFont(wxFont*) );
     wxDEPRECATED( void RemoveFont(wxFont*) );
 #endif
 };
 

-extern WXDLLEXPORT_DATA(wxFontList*)    wxTheFontList;
+extern WXDLLIMPEXP_DATA_CORE(wxFontList*)    wxTheFontList;

 
 #endif
     // _WX_FONT_H_BASE_
 
 #endif
     // _WX_FONT_H_BASE_