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

Updated font dialog constructors to use a reference to the font data

Browse Source 
as per more recent convention


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-05-18 11:05:58 +00:00
parent 44fbc477af
commit baaae89f09
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/fontdlgg.h
View File

@@ -59,10 +59,10 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
public: public:
wxGenericFontDialog(void); wxGenericFontDialog(void);
wxGenericFontDialog(wxWindow *parent, wxFontData *data = (wxFontData *) NULL); wxGenericFontDialog(wxWindow *parent, const wxFontData& data);
~wxGenericFontDialog(void); ~wxGenericFontDialog(void);
bool Create(wxWindow *parent, wxFontData *data = (wxFontData *) NULL); bool Create(wxWindow *parent, const wxFontData& data);
int ShowModal(void); int ShowModal(void);

4
include/wx/mac/fontdlg.h
View File

@@ -29,9 +29,9 @@ class WXDLLEXPORT wxFontDialog: public wxDialog
DECLARE_DYNAMIC_CLASS(wxFontDialog) DECLARE_DYNAMIC_CLASS(wxFontDialog)
public: public:
wxFontDialog(); wxFontDialog();
wxFontDialog(wxWindow *parent, wxFontData *data = NULL); wxFontDialog(wxWindow *parent, const wxFontData& data);
bool Create(wxWindow *parent, wxFontData *data = NULL); bool Create(wxWindow *parent, const wxFontData& data);
int ShowModal(); int ShowModal();
wxFontData& GetFontData() { return m_fontData; } wxFontData& GetFontData() { return m_fontData; }

2
src/common/fontmap.cpp
View File

@@ -882,7 +882,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
wxFontData data; wxFontData data;
data.SetEncoding(encoding); data.SetEncoding(encoding);
data.EncodingInfo() = *info; data.EncodingInfo() = *info;
wxFontDialog dialog(m_windowParent, &data); wxFontDialog dialog(m_windowParent, data);
if ( dialog.ShowModal() == wxID_OK ) if ( dialog.ShowModal() == wxID_OK )
{ {
wxFontData retData = dialog.GetFontData(); wxFontData retData = dialog.GetFontData();

2
src/common/utilscmn.cpp
View File

@@ -1002,7 +1002,7 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
} }
wxFont fontRet; wxFont fontRet;
wxFontDialog dialog(parent, &data); wxFontDialog dialog(parent, data);
if ( dialog.ShowModal() == wxID_OK ) if ( dialog.ShowModal() == wxID_OK )
{ {
fontRet = dialog.GetFontData().GetChosenFont(); fontRet = dialog.GetFontData().GetChosenFont();

7
src/generic/fontdlgg.cpp
View File

@@ -170,7 +170,7 @@ wxGenericFontDialog::wxGenericFontDialog(void)
dialogParent = NULL; dialogParent = NULL;
} }
wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, wxFontData *data): wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, const wxFontData& data):
wxDialog(parent, -1, _("Font"), wxDefaultPosition, wxDefaultSize, wxDialog(parent, -1, _("Font"), wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxRESIZE_BORDER) wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxRESIZE_BORDER)
{ {
@@ -188,12 +188,11 @@ void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
EndModal(wxID_CANCEL); EndModal(wxID_CANCEL);
} }
bool wxGenericFontDialog::Create(wxWindow *parent, wxFontData *data) bool wxGenericFontDialog::Create(wxWindow *parent, const wxFontData& data)
{ {
dialogParent = parent; dialogParent = parent;
if (data) fontData = data;
fontData = *data;
InitializeFont(); InitializeFont();
CreateWidgets(); CreateWidgets();

7
src/mac/carbon/fontdlg.cpp
View File

@@ -30,17 +30,16 @@ wxFontDialog::wxFontDialog()
m_dialogParent = NULL; m_dialogParent = NULL;
} }
wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data) wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data)
{ {
Create(parent, data); Create(parent, data);
} }
bool wxFontDialog::Create(wxWindow *parent, wxFontData *data) bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
{ {
m_dialogParent = parent; m_dialogParent = parent;
if (data) m_fontData = data;
m_fontData = *data;
// TODO: you may need to do dialog creation here, unless it's // TODO: you may need to do dialog creation here, unless it's
// done in ShowModal. // done in ShowModal.

7
src/mac/fontdlg.cpp
View File

@@ -30,17 +30,16 @@ wxFontDialog::wxFontDialog()
m_dialogParent = NULL; m_dialogParent = NULL;
} }
wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data) wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data)
{ {
Create(parent, data); Create(parent, data);
} }
bool wxFontDialog::Create(wxWindow *parent, wxFontData *data) bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
{ {
m_dialogParent = parent; m_dialogParent = parent;
if (data) m_fontData = data;
m_fontData = *data;
// TODO: you may need to do dialog creation here, unless it's // TODO: you may need to do dialog creation here, unless it's
// done in ShowModal. // done in ShowModal.