#include "wx/gdiobj.h"
#include "wx/os2/private.h"
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxEmptyString;
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase
{
public:
// ctors and such
wxFont() { }
- wxFont( int nSize
- ,int nFamily
- ,int nStyle
- ,int nWeight
- ,bool bUnderlined = false
- ,const wxString& rsFace = wxEmptyString
- ,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT
- )
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+ wxFont(int size,
+ int family,
+ int style,
+ int weight,
+ bool underlined = false,
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
- (void)Create( nSize
- ,nFamily
- ,nStyle
- ,nWeight
- ,bUnderlined
- ,rsFace
- ,vEncoding
- );
+ (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
+ }
+#endif
+
+ 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);
}
+
+ wxFont(const wxSize& pixelSize,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined = false,
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+ {
+ Create(10, family, style, weight, underlined, face, encoding);
+ SetPixelSize(pixelSize);
+ }
+
+ bool Create(int size,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined = false,
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
wxFont( const wxNativeFontInfo& rInfo
,WXHFONT hFont = 0
wxFont(const wxString& rsFontDesc);
- bool Create( int nSize
- ,int nFamily
- ,int nStyle
- ,int nWeight
- ,bool bUnderlined = false
- ,const wxString& rsFace = wxEmptyString
- ,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT
- );
bool Create( const wxNativeFontInfo& rInfo
,WXHFONT hFont = 0
);
// Implement base class pure virtuals
//
virtual int GetPointSize(void) const;
- virtual int GetFamily(void) const;
- virtual int GetStyle(void) const;
- virtual int GetWeight(void) const;
+ virtual wxFontFamily GetFamily() const;
+ virtual wxFontStyle GetStyle() const;
+ virtual wxFontWeight GetWeight() const;
virtual bool GetUnderlined(void) const;
virtual wxString GetFaceName(void) const;
virtual wxFontEncoding GetEncoding(void) const;
virtual const wxNativeFontInfo* GetNativeFontInfo() const;
virtual void SetPointSize(int nPointSize);
- virtual void SetFamily(int nFamily);
- virtual void SetStyle(int nStyle);
- virtual void SetWeight(int nWeight);
+ virtual void SetFamily(wxFontFamily family);
+ virtual void SetStyle(wxFontStyle style);
+ virtual void SetWeight(wxFontWeight weight);
virtual bool SetFaceName(const wxString& rsFaceName);
virtual void SetUnderlined(bool bUnderlined);
virtual void SetEncoding(wxFontEncoding vEncoding);
+ wxDECLARE_COMMON_FONT_METHODS();
+
//
// For internal use only!
//