Applied patch [ 746355 ] Adds some checks for chkconf.h

[wxWidgets.git] / include / wx / mac / app.h

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 5f269ffc052567003c87459ed7ec5ee62f8e4769..23b4cb0a60c638fe90ce4a403dfd8ddae495d304 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.h
 // Purpose:     wxApp class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.h
 // Purpose:     wxApp class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "app.h"
 #endif
 
 #pragma interface "app.h"
 #endif
 


@@ -53,10 +53,15 @@ class WXDLLEXPORT wxApp: public wxAppBase
     virtual bool Pending() ;
     virtual void Dispatch() ;
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual bool Pending() ;
     virtual void Dispatch() ;
     virtual bool Yield(bool onlyIfNeeded = FALSE);

+    virtual bool ProcessIdle();

     
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
     
     
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
     

+#if wxUSE_GUI
+    // setting up all MacOS Specific Event-Handlers etc
+    virtual bool OnInitGui();
+#endif // wxUSE_GUI

     // implementation only
     void OnIdle(wxIdleEvent& event);
     void OnEndSession(wxCloseEvent& event);
     // implementation only
     void OnIdle(wxIdleEvent& event);
     void OnEndSession(wxCloseEvent& event);


@@ -85,29 +90,38 @@ public:
     static bool Initialize();
     static void CleanUp();
     
     static bool Initialize();
     static void CleanUp();
     

-    virtual bool OnInit();

     void DeletePendingObjects();
     void DeletePendingObjects();

-    bool ProcessIdle();

     bool IsExiting() { return !m_keepGoing ; }
     bool IsExiting() { return !m_keepGoing ; }

-    
+#if TARGET_CARBON
+    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
+    WXEVENTHANDLERREF    MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
+#endif
+

 public:
     static long           sm_lastMessageTime;
     static wxWindow*      s_captureWindow ;
     static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
     static WXHRGN         s_macCursorRgn ;
 public:
     static long           sm_lastMessageTime;
     static wxWindow*      s_captureWindow ;
     static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
     static WXHRGN         s_macCursorRgn ;

-    WXEVENTREF            m_macCurrentEvent ;
+    static long           s_lastModifiers ;

     
     int                   m_nCmdShow;
     
     
     int                   m_nCmdShow;
     

-protected:
+private:

     bool                  m_keepGoing ;
 
     // mac specifics
     bool                  m_keepGoing ;
 
     // mac specifics

+#if TARGET_CARBON
+    WXEVENTHANDLERREF      m_macEventHandler ;
+    WXEVENTHANDLERCALLREF      m_macCurrentEventHandlerCallRef ;
+#endif
+    WXEVENTREF            m_macCurrentEvent ;

 
 public:
     static bool           s_macDefaultEncodingIsPC ;
     static bool           s_macSupportPCMenuShortcuts ;
     static long           s_macAboutMenuItemId ;
 
 public:
     static bool           s_macDefaultEncodingIsPC ;
     static bool           s_macSupportPCMenuShortcuts ;
     static long           s_macAboutMenuItemId ;

+    static long           s_macPreferencesMenuItemId ;
+    static long           s_macExitMenuItemId ;

     static wxString       s_macHelpMenuTitleName ;
 
     static bool           s_macHasAppearance ;
     static wxString       s_macHelpMenuTitleName ;
 
     static bool           s_macHasAppearance ;


@@ -127,37 +141,45 @@ public:
     
     virtual void          MacSuspend( bool convertClipboard ) ;
     virtual void          MacResume( bool convertClipboard ) ;
     
     virtual void          MacSuspend( bool convertClipboard ) ;
     virtual void          MacResume( bool convertClipboard ) ;

-

     virtual void          MacConvertPrivateToPublicScrap() ;
     virtual void          MacConvertPublicToPrivateScrap() ;
     virtual void          MacConvertPrivateToPublicScrap() ;
     virtual void          MacConvertPublicToPrivateScrap() ;

-
-    // event main methods
-
+    

     void                  MacDoOneEvent() ;
     void                  MacDoOneEvent() ;

-    void                  MacHandleOneEvent( WXEVENTREF ev ) ;

     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }

-  
-    // primary events
-       
-    virtual void          MacHandleMouseDownEvent( WXEVENTREF ev ) ;
+    void                  MacHandleOneEvent( WXEVENTREF ev ) ;
+#if !TARGET_CARBON
+    virtual void          MacHandleMenuSelect( int menuid , int menuitem ) ;

     virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;

+    virtual void          MacHandleOSEvent( WXEVENTREF ev ) ;
+    virtual void          MacHandleDiskEvent( WXEVENTREF ev ) ;

     virtual void          MacHandleActivateEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleUpdateEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleActivateEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleUpdateEvent( WXEVENTREF ev ) ;

+    virtual void          MacHandleMouseDownEvent( WXEVENTREF ev ) ;
+
+    void                  MacHandleModifierEvents( WXEVENTREF ev ) ;
+

     virtual void          MacHandleKeyDownEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleKeyUpEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleKeyDownEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleKeyUpEvent( WXEVENTREF ev ) ;

-    virtual void          MacHandleDiskEvent( WXEVENTREF ev ) ;
-    virtual void          MacHandleOSEvent( WXEVENTREF ev ) ;

     virtual void          MacHandleHighLevelEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleHighLevelEvent( WXEVENTREF ev ) ;

-    virtual void          MacHandleMenuSelect( int menuid , int menuitem ) ;
-    
-    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) ;
     
     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) ;
+    // in response of a print-document apple event
+    virtual void         MacPrintFile(const wxString &fileName) ;
+    // in response of a open-application apple event
+    virtual void         MacNewFile() ;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -175,42 +197,6 @@ private:
     short       m_currentRefNum ;
 } ;
 
     short       m_currentRefNum ;
 } ;
 

-// TODO: add platform-specific arguments
-int WXDLLEXPORT wxEntry( int argc, char *argv[] , bool enterLoop = TRUE);
-
-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_
 
 #endif
     // _WX_APP_H_