GTK1 fixes after wxObject-derived classes copy ctors/assignment operators simplifications (patch 1428863)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,14 +30,11 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase
|
||||
{
|
||||
public:
|
||||
// ctors and such
|
||||
wxFont() { Init(); }
|
||||
wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
|
||||
wxFont() { }
|
||||
|
||||
// wxGTK-specific
|
||||
wxFont(const wxString& fontname)
|
||||
{
|
||||
Init();
|
||||
|
||||
Create(fontname);
|
||||
}
|
||||
|
||||
@@ -51,8 +48,6 @@ public:
|
||||
const wxString& face = wxEmptyString,
|
||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
|
||||
{
|
||||
Init();
|
||||
|
||||
(void)Create(size, family, style, weight, underlined, face, encoding);
|
||||
}
|
||||
|
||||
@@ -69,9 +64,6 @@ public:
|
||||
|
||||
~wxFont();
|
||||
|
||||
// assignment
|
||||
wxFont& operator=(const wxFont& font);
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual int GetPointSize() const;
|
||||
virtual int GetFamily() const;
|
||||
@@ -104,9 +96,6 @@ public:
|
||||
protected:
|
||||
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
|
||||
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxFont)
|
||||
};
|
||||
|
Reference in New Issue
Block a user