Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to wxFontDialog after recent changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-12 22:26:01 +00:00
parent dbc65e2760
commit 3fde374f3f
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/fontdlg.h
View File

@@ -28,13 +28,14 @@ class WXDLLEXPORT wxFontDialogBase : public wxDialog
public: public:
// create the font dialog // create the font dialog
wxFontDialogBase() { } wxFontDialogBase() { }
wxFontDialogBase(wxWindow *parent) { } wxFontDialogBase(wxWindow *parent) { m_parent = parent; }
wxFontDialogBase(wxWindow *parent, const wxFontData& data) { } wxFontDialogBase(wxWindow *parent, const wxFontData& data)
{ m_parent = parent; InitFontData(&data); }
bool Create(wxWindow *parent) bool Create(wxWindow *parent)
{ return DoCreate(parent); } { return DoCreate(parent); }
bool Create(wxWindow *parent, const wxFontData& data) bool Create(wxWindow *parent, const wxFontData& data)
{ m_fontData = data; return Create(parent); } { InitFontData(&data); return Create(parent); }
virtual ~wxFontDialogBase(); virtual ~wxFontDialogBase();
@@ -44,14 +45,17 @@ public:
// deprecated interface, for compatibility only, don't use // deprecated interface, for compatibility only, don't use
wxFontDialogBase(wxWindow *parent, const wxFontData *data) wxFontDialogBase(wxWindow *parent, const wxFontData *data)
{ Init(); Create(parent, data); } { m_parent = parent; InitFontData(data); }
bool Create(wxWindow *parent, const wxFontData *data) bool Create(wxWindow *parent, const wxFontData *data)
{ if ( data ) m_fontData = *data; return Create(parent); } { InitFontData(data); return Create(parent); }
protected: protected:
virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return TRUE; } virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return TRUE; }
void InitFontData(const wxFontData *data = NULL)
{ if ( data ) m_fontData = *data; }
wxFontData m_fontData; wxFontData m_fontData;
}; };

13
include/wx/msw/fontdlg.h
View File

@@ -23,16 +23,17 @@
class WXDLLEXPORT wxFontDialog : public wxFontDialogBase class WXDLLEXPORT wxFontDialog : public wxFontDialogBase
{ {
public: public:
wxFontDialog() : wxFontDialogBase() { } wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
wxFontDialog(wxWindow *parent) : wxFontDialogBase(parent) { } wxFontDialog(wxWindow *parent)
: wxFontDialogBase(parent) { Create(parent); }
wxFontDialog(wxWindow *parent, const wxFontData& data) wxFontDialog(wxWindow *parent, const wxFontData& data)
: wxFontDialogBase(parent, data) { } : wxFontDialogBase(parent, data) { Create(parent, data); }
virtual int ShowModal(); virtual int ShowModal();
// deprecated // deprecated interface, don't use
wxFontDialog(wxWindow *parent, wxFontData *data) wxFontDialog(wxWindow *parent, const wxFontData *data)
: wxFontDialogBase(parent, data) { } : wxFontDialogBase(parent, data) { Create(parent, data); }
protected: protected:
DECLARE_DYNAMIC_CLASS(wxFontDialog) DECLARE_DYNAMIC_CLASS(wxFontDialog)