Removed #ifdef __WXMAC__ around dialog initialisation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -167,9 +167,7 @@ void wxGenericFontDialog::Init()
|
|||||||
{
|
{
|
||||||
m_useEvents = FALSE;
|
m_useEvents = FALSE;
|
||||||
m_previewer = NULL;
|
m_previewer = NULL;
|
||||||
#ifdef __WXMAC__
|
|
||||||
Create( m_parent ) ;
|
Create( m_parent ) ;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxGenericFontDialog::~wxGenericFontDialog()
|
wxGenericFontDialog::~wxGenericFontDialog()
|
||||||
@@ -183,14 +181,13 @@ 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,
|
if ( !wxDialog::Create( parent , -1 , _T("Choose Font") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
|
||||||
_T("fontdialog") ) )
|
_T("fontdialog") ) )
|
||||||
{
|
{
|
||||||
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
|
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
InitializeFont();
|
InitializeFont();
|
||||||
CreateWidgets();
|
CreateWidgets();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user