X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbf8aca6d4972b7a92e483e52245485c14e700f6..339963e0d0b273eec7fb419aeeb78f31c16d6730:/include/wx/mac/app.h diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h index 498fe3e71c..3b9d29880f 100644 --- a/include/wx/mac/app.h +++ b/include/wx/mac/app.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: app.h // Purpose: wxApp class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_APP_H_ #define _WX_APP_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "app.h" #endif @@ -52,8 +52,11 @@ class WXDLLEXPORT wxApp: public wxAppBase virtual bool Initialized(); virtual bool Pending() ; virtual void Dispatch() ; + + virtual void Exit(); + virtual bool Yield(bool onlyIfNeeded = FALSE); - virtual bool ProcessIdle(); + virtual void WakeUpIdle(); virtual void SetPrintMode(int mode) { m_printMode = mode; } virtual int GetPrintMode() const { return m_printMode; } @@ -67,14 +70,6 @@ class WXDLLEXPORT wxApp: public wxAppBase void OnEndSession(wxCloseEvent& event); void OnQueryEndSession(wxCloseEvent& event); - // Send idle event to all top-level windows. - // Returns TRUE if more idle time is requested. - bool SendIdleEvents(); - - // Send idle event to window and all subwindows - // Returns TRUE if more idle time is requested. - bool SendIdleEvents(wxWindowMac* win); - // Windows only, but for compatibility... inline void SetAuto3D(bool flag) { m_auto3D = flag; } inline bool GetAuto3D() const { return m_auto3D; } @@ -87,13 +82,13 @@ protected: public: // Implementation - static bool Initialize(); - static void CleanUp(); + virtual bool Initialize(int& argc, wxChar **argv); + virtual void CleanUp(); - void DeletePendingObjects(); bool IsExiting() { return !m_keepGoing ; } #if TARGET_CARBON - WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } + WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } + WXEVENTHANDLERREF MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; } #endif public: @@ -102,21 +97,20 @@ public: static int s_lastMouseDown ; // 0 = none , 1 = left , 2 = right static WXHRGN s_macCursorRgn ; static long s_lastModifiers ; - WXEVENTREF m_macCurrentEvent ; int m_nCmdShow; -protected: +private: bool m_keepGoing ; // mac specifics - -public: #if TARGET_CARBON - // public to avoid change in initialization order of handlers - // could be moved into a override of OnInitGui eventually - WXEVENTHANDLERREF m_macEventHandler ; + WXEVENTHANDLERREF m_macEventHandler ; + WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ; #endif + WXEVENTREF m_macCurrentEvent ; + +public: static bool s_macDefaultEncodingIsPC ; static bool s_macSupportPCMenuShortcuts ; static long s_macAboutMenuItemId ; @@ -144,6 +138,9 @@ public: virtual void MacConvertPrivateToPublicScrap() ; virtual void MacConvertPublicToPrivateScrap() ; + void MacDoOneEvent() ; + WXEVENTREF MacGetCurrentEvent() { return m_macCurrentEvent ; } + void MacHandleOneEvent( WXEVENTREF ev ) ; #if !TARGET_CARBON virtual void MacHandleMenuSelect( int menuid , int menuitem ) ; virtual void MacHandleMouseUpEvent( WXEVENTREF ev ) ; @@ -151,37 +148,31 @@ public: virtual void MacHandleDiskEvent( WXEVENTREF ev ) ; virtual void MacHandleActivateEvent( WXEVENTREF ev ) ; virtual void MacHandleUpdateEvent( WXEVENTREF ev ) ; -#endif virtual void MacHandleMouseDownEvent( WXEVENTREF ev ) ; - void MacHandleMenuCommand( wxUint32 command ) ; - // event main methods - - void MacDoOneEvent() ; - void MacHandleOneEvent( WXEVENTREF ev ) ; void MacHandleModifierEvents( WXEVENTREF ev ) ; - WXEVENTREF MacGetCurrentEvent() { return m_macCurrentEvent ; } - - // primary events - + virtual void MacHandleKeyDownEvent( WXEVENTREF ev ) ; virtual void MacHandleKeyUpEvent( WXEVENTREF ev ) ; virtual void MacHandleHighLevelEvent( WXEVENTREF ev ) ; - virtual bool MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ; - virtual bool MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ; - +#endif + + void MacHandleMenuCommand( wxUint32 command ) ; + bool MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ; + bool MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ; + virtual short MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; // in response of an open-document apple event - virtual void MacOpenFile(const wxString &fileName) ; + virtual void MacOpenFile(const wxString &fileName) ; // in response of a print-document apple event - virtual void MacPrintFile(const wxString &fileName) ; + virtual void MacPrintFile(const wxString &fileName) ; // in response of a open-application apple event - virtual void MacNewFile() ; + virtual void MacNewFile() ; DECLARE_EVENT_TABLE() }; @@ -200,44 +191,6 @@ private: short m_currentRefNum ; } ; -// TODO: add platform-specific arguments -#ifndef __DARWIN__ -int WXDLLEXPORT wxEntry( int argc, char *argv[] , bool enterLoop = TRUE); -#endif - -void wxMacConvertFromPCForControls( char * p ) ; - -void wxMacConvertToPC( const char *from , char *to , int len ) ; -void wxMacConvertFromPC( const char *from , char *to , int len ) ; -void wxMacConvertToPC( const char *from , char *to , int len ) ; -void wxMacConvertFromPC( char * p ) ; -void wxMacConvertFromPC( unsigned char *p ) ; -wxString wxMacMakeMacStringFromPC( const char * p ) ; -void wxMacConvertToPC( char * p ) ; -void wxMacConvertToPC( unsigned char *p ) ; -wxString wxMacMakePCStringFromMac( const char * p ) ; - -// converts this string into a pascal with optional pc 2 mac encoding -void wxMacStringToPascal( const char * from , unsigned char* to , bool pc2macEncoding ) ; - -// converts this string into a pascal with pc 2 mac encoding if s_macDefaultEncodingIsPC -inline void wxMacStringToPascal( const char * from , unsigned char* to ) - { wxMacStringToPascal( from , to , wxApp::s_macDefaultEncodingIsPC ) ; } - -// converts this string into a pascal with optional mac 2 pc encoding -wxString wxMacMakeStringFromPascal( unsigned char* from , bool mac2pcEncoding ) ; - -// converts this pascal string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC -inline wxString wxMacMakeStringFromPascal( unsigned char* from ) - { return wxMacMakeStringFromPascal( from , wxApp::s_macDefaultEncodingIsPC ) ; } - -// converts this c string into a wxString with optional mac 2 pc encoding -wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) ; - -// converts this c string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC -inline wxString wxMacMakeStringFromMacString( const char* from ) - { return wxMacMakeStringFromMacString( from , wxApp::s_macDefaultEncodingIsPC ) ; } - #endif // _WX_APP_H_