Add wxFontDialog ctor not taking wxFontData to wxOSX.
wxFontDialog should have ctor and Create() overload taking just wxWindow parent in addition to the one taking parent and wxFontData used to initialize the dialog but it didn't have them in wxOSX, do add them now. Closes #13908. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,9 +35,11 @@ class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxFontDialog();
|
wxFontDialog();
|
||||||
|
wxFontDialog(wxWindow *parent);
|
||||||
wxFontDialog(wxWindow *parent, const wxFontData& data);
|
wxFontDialog(wxWindow *parent, const wxFontData& data);
|
||||||
virtual ~wxFontDialog();
|
virtual ~wxFontDialog();
|
||||||
|
|
||||||
|
bool Create(wxWindow *parent);
|
||||||
bool Create(wxWindow *parent, const wxFontData& data);
|
bool Create(wxWindow *parent, const wxFontData& data);
|
||||||
|
|
||||||
int ShowModal();
|
int ShowModal();
|
||||||
|
@@ -202,6 +202,11 @@ wxFontDialog::wxFontDialog()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxFontDialog::wxFontDialog(wxWindow *parent)
|
||||||
|
{
|
||||||
|
Create(parent);
|
||||||
|
}
|
||||||
|
|
||||||
wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data)
|
wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data)
|
||||||
{
|
{
|
||||||
Create(parent, data);
|
Create(parent, data);
|
||||||
@@ -211,10 +216,15 @@ wxFontDialog::~wxFontDialog()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxFontDialog::Create(wxWindow *WXUNUSED(parent), const wxFontData& data)
|
bool wxFontDialog::Create(wxWindow *WXUNUSED(parent))
|
||||||
|
{
|
||||||
|
return true ;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
|
||||||
{
|
{
|
||||||
m_fontData = data;
|
m_fontData = data;
|
||||||
return true ;
|
return Create(parent) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
int wxFontDialog::ShowModal()
|
int wxFontDialog::ShowModal()
|
||||||
|
@@ -351,6 +351,11 @@ wxFontDialog::wxFontDialog()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxFontDialog::wxFontDialog(wxWindow *parent)
|
||||||
|
{
|
||||||
|
Create(parent);
|
||||||
|
}
|
||||||
|
|
||||||
wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data)
|
wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data)
|
||||||
{
|
{
|
||||||
Create(parent, data);
|
Create(parent, data);
|
||||||
@@ -360,10 +365,20 @@ wxFontDialog::~wxFontDialog()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxFontDialog::Create(wxWindow *parent)
|
||||||
|
{
|
||||||
|
return Create(parent);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
|
bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
|
||||||
{
|
{
|
||||||
m_fontData = data;
|
m_fontData = data;
|
||||||
|
|
||||||
|
return Create(parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxFontDialog::Create(wxWindow *parent)
|
||||||
|
{
|
||||||
//autorelease pool - req'd for carbon
|
//autorelease pool - req'd for carbon
|
||||||
NSAutoreleasePool *thePool;
|
NSAutoreleasePool *thePool;
|
||||||
thePool = [[NSAutoreleasePool alloc] init];
|
thePool = [[NSAutoreleasePool alloc] init];
|
||||||
|
Reference in New Issue
Block a user