Cleaned up some comments, reorganized some code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -9,14 +9,6 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// declarations
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
// headers
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
@@ -45,12 +37,14 @@
|
|||||||
#import <Foundation/NSThread.h>
|
#import <Foundation/NSThread.h>
|
||||||
#import <AppKit/NSEvent.h>
|
#import <AppKit/NSEvent.h>
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ========================================================================
|
||||||
// globals
|
// wxPoseAsInitializer
|
||||||
// ----------------------------------------------------------------------------
|
// ========================================================================
|
||||||
|
|
||||||
wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
|
wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
|
||||||
|
|
||||||
|
// ========================================================================
|
||||||
|
// wxPoserNSApplication
|
||||||
|
// ========================================================================
|
||||||
@interface wxPoserNSApplication : NSApplication
|
@interface wxPoserNSApplication : NSApplication
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -60,6 +54,8 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
|
|||||||
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
|
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
|
||||||
@end // wxPoserNSApplication
|
@end // wxPoserNSApplication
|
||||||
|
|
||||||
|
WX_IMPLEMENT_POSER(wxPoserNSApplication);
|
||||||
|
|
||||||
@implementation wxPoserNSApplication : NSApplication
|
@implementation wxPoserNSApplication : NSApplication
|
||||||
|
|
||||||
- (void)doIdle: (id)data
|
- (void)doIdle: (id)data
|
||||||
@@ -110,40 +106,24 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
|
|||||||
}
|
}
|
||||||
|
|
||||||
@end // wxPoserNSApplication
|
@end // wxPoserNSApplication
|
||||||
WX_IMPLEMENT_POSER(wxPoserNSApplication);
|
|
||||||
|
|
||||||
// ============================================================================
|
// ========================================================================
|
||||||
// functions
|
// wxApp
|
||||||
// ============================================================================
|
// ========================================================================
|
||||||
|
|
||||||
void wxApp::Exit()
|
|
||||||
{
|
|
||||||
wxApp::CleanUp();
|
|
||||||
|
|
||||||
wxAppConsole::Exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// wxApp implementation
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxApp Static member initialization
|
// wxApp Static member initialization
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
|
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
|
||||||
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
|
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
|
||||||
EVT_IDLE(wxAppBase::OnIdle)
|
EVT_IDLE(wxAppBase::OnIdle)
|
||||||
// EVT_END_SESSION(wxApp::OnEndSession)
|
// EVT_END_SESSION(wxApp::OnEndSession)
|
||||||
// EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
|
// EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
#endif
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxApp initialization/cleanup
|
// wxApp initialization/cleanup
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
bool wxApp::Initialize(int& argc, wxChar **argv)
|
bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||||
{
|
{
|
||||||
wxAutoNSAutoreleasePool pool;
|
wxAutoNSAutoreleasePool pool;
|
||||||
@@ -180,7 +160,6 @@ void wxApp::CleanUp()
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxApp creation
|
// wxApp creation
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
wxApp::wxApp()
|
wxApp::wxApp()
|
||||||
{
|
{
|
||||||
m_topWindow = NULL;
|
m_topWindow = NULL;
|
||||||
@@ -259,6 +238,13 @@ bool wxApp::Initialized()
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxApp::Exit()
|
||||||
|
{
|
||||||
|
wxApp::CleanUp();
|
||||||
|
|
||||||
|
wxAppConsole::Exit();
|
||||||
|
}
|
||||||
|
|
||||||
int wxApp::MainLoop()
|
int wxApp::MainLoop()
|
||||||
{
|
{
|
||||||
[m_cocoaApp run];
|
[m_cocoaApp run];
|
||||||
@@ -292,7 +278,6 @@ void wxApp::Dispatch()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Yield to other processes
|
// Yield to other processes
|
||||||
|
|
||||||
bool wxApp::Yield(bool onlyIfNeeded)
|
bool wxApp::Yield(bool onlyIfNeeded)
|
||||||
{
|
{
|
||||||
// MT-FIXME
|
// MT-FIXME
|
||||||
|
Reference in New Issue
Block a user