moving OnInit back
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -841,7 +841,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if wxOSX_USE_CARBON
|
#if wxOSX_USE_COCOA_OR_CARBON
|
||||||
bool wxApp::CallOnInit()
|
bool wxApp::CallOnInit()
|
||||||
{
|
{
|
||||||
wxMacAutoreleasePool autoreleasepool;
|
wxMacAutoreleasePool autoreleasepool;
|
||||||
|
@@ -99,7 +99,6 @@ void wxMacWakeUp()
|
|||||||
|
|
||||||
- (void)applicationWillFinishLaunching:(NSApplication *)application {
|
- (void)applicationWillFinishLaunching:(NSApplication *)application {
|
||||||
wxUnusedVar(application);
|
wxUnusedVar(application);
|
||||||
wxTheApp->OnInit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
|
- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
|
||||||
@@ -227,14 +226,6 @@ void wxMacWakeUp()
|
|||||||
}
|
}
|
||||||
@end
|
@end
|
||||||
|
|
||||||
bool wxApp::CallOnInit()
|
|
||||||
{
|
|
||||||
if ( sm_isEmbedded )
|
|
||||||
return OnInit();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wxApp::DoInitGui()
|
bool wxApp::DoInitGui()
|
||||||
{
|
{
|
||||||
wxMacAutoreleasePool pool;
|
wxMacAutoreleasePool pool;
|
||||||
|
Reference in New Issue
Block a user