added creation of dialog - perhaps needed for all platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -167,6 +167,7 @@ void wxGenericFontDialog::Init()
|
|||||||
{
|
{
|
||||||
m_useEvents = FALSE;
|
m_useEvents = FALSE;
|
||||||
m_previewer = NULL;
|
m_previewer = NULL;
|
||||||
|
Create( m_parent ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxGenericFontDialog::~wxGenericFontDialog()
|
wxGenericFontDialog::~wxGenericFontDialog()
|
||||||
@@ -180,6 +181,14 @@ void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
bool wxGenericFontDialog::DoCreate(wxWindow *parent)
|
bool wxGenericFontDialog::DoCreate(wxWindow *parent)
|
||||||
{
|
{
|
||||||
|
#ifdef __WXMAC__
|
||||||
|
if ( !wxDialog::Create( parent , -1 , _T("Choose Font") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
|
||||||
|
_T("fontdialog") ) )
|
||||||
|
{
|
||||||
|
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
InitializeFont();
|
InitializeFont();
|
||||||
CreateWidgets();
|
CreateWidgets();
|
||||||
|
|
||||||
@@ -188,7 +197,7 @@ bool wxGenericFontDialog::DoCreate(wxWindow *parent)
|
|||||||
|
|
||||||
int wxGenericFontDialog::ShowModal()
|
int wxGenericFontDialog::ShowModal()
|
||||||
{
|
{
|
||||||
int ret = wxDialog::ShowModal();
|
int ret = wxDialog::ShowModal();
|
||||||
|
|
||||||
if (ret != wxID_CANCEL)
|
if (ret != wxID_CANCEL)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user