projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't shadow declaration of nIndex variable
[wxWidgets.git]
/
src
/
cocoa
/
app.mm
diff --git
a/src/cocoa/app.mm
b/src/cocoa/app.mm
index f1d604d3791e577b924f41370bb1229334212f1d..0ac5bca28e2cbb756468c7b14be3a1723f813ca7 100644
(file)
--- a/
src/cocoa/app.mm
+++ b/
src/cocoa/app.mm
@@
-37,7
+37,7
@@
bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin
// wxNSApplicationObserver singleton.
bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin
// wxNSApplicationObserver singleton.
-static wxObjcAutoRefFromAlloc<wxNSApplicationObserver*> sg_cocoaAppObserver = [[
wxNSApplicationObserver
alloc] init];
+static wxObjcAutoRefFromAlloc<wxNSApplicationObserver*> sg_cocoaAppObserver = [[
WX_GET_OBJC_CLASS(wxNSApplicationObserver)
alloc] init];
// ========================================================================
// wxNSApplicationDelegate
// ========================================================================
// wxNSApplicationDelegate
@@
-53,6
+53,7
@@
static wxObjcAutoRefFromAlloc<wxNSApplicationObserver*> sg_cocoaAppObserver = [[
}
@end // implementation wxNSApplicationDelegate : NSObject
}
@end // implementation wxNSApplicationDelegate : NSObject
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationDelegate,NSObject)
// ========================================================================
// wxNSApplicationObserver
// ========================================================================
// wxNSApplicationObserver
@@
-90,6
+91,7
@@
static wxObjcAutoRefFromAlloc<wxNSApplicationObserver*> sg_cocoaAppObserver = [[
}
@end // implementation wxNSApplicationObserver : NSObject
}
@end // implementation wxNSApplicationObserver : NSObject
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationObserver,NSObject)
// ========================================================================
// wxApp
// ========================================================================
// wxApp
@@
-99,11
+101,6
@@
static wxObjcAutoRefFromAlloc<wxNSApplicationObserver*> sg_cocoaAppObserver = [[
// wxApp Static member initialization
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
// wxApp Static member initialization
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxAppBase::OnIdle)
-// EVT_END_SESSION(wxApp::OnEndSession)
-// EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
-END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// wxApp initialization/cleanup
// ----------------------------------------------------------------------------
// wxApp initialization/cleanup
@@
-194,7
+191,7
@@
bool wxApp::OnInitGui()
if(!sm_isEmbedded)
{
// Enable response to application delegate messages
if(!sm_isEmbedded)
{
// Enable response to application delegate messages
- m_cocoaAppDelegate = [[
wxNSApplicationDelegate
alloc] init];
+ m_cocoaAppDelegate = [[
WX_GET_OBJC_CLASS(wxNSApplicationDelegate)
alloc] init];
[m_cocoaApp setDelegate:m_cocoaAppDelegate];
}
[m_cocoaApp setDelegate:m_cocoaAppDelegate];
}