/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name: wx/x11/font.h
// Purpose: wxFont class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FONT_H_
// ctors and such
wxFont() { }
+#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)
+ int family,
+ int style,
+ int weight,
+ bool underlined = false,
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
- (void)Create(size, family, style, weight, underlined, face, encoding);
+ (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
+#endif
- wxFont(const wxNativeFontInfo& info);
-
+ 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,
- int family,
- int style,
- int weight,
- bool underlined = FALSE,
- const wxString& face = wxEmptyString,
- wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined = false,
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+ wxFont(const wxNativeFontInfo& info);
// FIXME: I added the ! to make it compile;
// is this right? - JACS
// implement base class pure virtuals
virtual int GetPointSize() 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 IsFixedWidth() const;
virtual void SetPointSize(int pointSize);
- 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);
+ wxDECLARE_COMMON_FONT_METHODS();
+
virtual void SetNoAntiAliasing( bool no = TRUE );
virtual bool GetNoAntiAliasing() const ;
#endif
protected:
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
void Unshare();
};
#endif
-// _WX_FONT_H_
+ // _WX_FONT_H_