Got rid wx-license

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

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 472e9697bede544772650d1435c9e381775051a7..7b2c3462b1c20c6c8cc5b1ac26f4974d95599fd8 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_
 

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

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


@@ -43,21 +43,23 @@ bool WXDLLEXPORT wxYield();
 class WXDLLEXPORT wxApp: public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 class WXDLLEXPORT wxApp: public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)

-        
+

     wxApp();
     virtual ~wxApp() {}
 
     virtual int MainLoop();
     virtual void ExitMainLoop();
     wxApp();
     virtual ~wxApp() {}
 
     virtual int MainLoop();
     virtual void ExitMainLoop();

-    virtual bool Initialized();

     virtual bool Pending() ;
     virtual bool Pending() ;

-    virtual void Dispatch() ;
+    virtual bool Dispatch() ;
+
+    virtual void Exit();
+

     virtual bool Yield(bool onlyIfNeeded = FALSE);
     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; }
     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();
 #if wxUSE_GUI
     // setting up all MacOS Specific Event-Handlers etc
     virtual bool OnInitGui();


@@ -66,19 +68,11 @@ class WXDLLEXPORT wxApp: public wxAppBase
     void OnIdle(wxIdleEvent& event);
     void OnEndSession(wxCloseEvent& event);
     void OnQueryEndSession(wxCloseEvent& event);
     void OnIdle(wxIdleEvent& event);
     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; }
     // Windows only, but for compatibility...
     inline void SetAuto3D(bool flag) { m_auto3D = flag; }
     inline bool GetAuto3D() const { return m_auto3D; }

-    
+

 protected:
     bool                  m_showOnInit;
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 protected:
     bool                  m_showOnInit;
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT


@@ -86,15 +80,18 @@ protected:
                                        // where overriden
 public:
 
                                        // where overriden
 public:
 

+    static bool           sm_isEmbedded;

     // Implementation
     // Implementation

-    static bool Initialize();
-    static void CleanUp();
-    
-    void DeletePendingObjects();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+

     bool IsExiting() { return !m_keepGoing ; }
 #if TARGET_CARBON
     bool IsExiting() { return !m_keepGoing ; }
 #if TARGET_CARBON

-       WXEVENTHANDLERREF       MacGetEventHandler() { return m_macEventHandler ; }
-       WXEVENTHANDLERREF       MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
+    // the installed application event handler
+    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
+    WXEVENTHANDLERREF    MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
+    void MacSetCurrentEvent( WXEVENTREF event , WXEVENTHANDLERCALLREF handler )
+    { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }

 #endif
 
 public:
 #endif
 
 public:


@@ -103,21 +100,20 @@ public:
     static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
     static WXHRGN         s_macCursorRgn ;
     static long           s_lastModifiers ;
     static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
     static WXHRGN         s_macCursorRgn ;
     static long           s_lastModifiers ;

-    
+

     int                   m_nCmdShow;
     int                   m_nCmdShow;

-    
+

 private:
     bool                  m_keepGoing ;
 
     // mac specifics
 #if TARGET_CARBON
 private:
     bool                  m_keepGoing ;
 
     // mac specifics
 #if TARGET_CARBON

-       WXEVENTHANDLERREF         m_macEventHandler ;
-       WXEVENTHANDLERCALLREF     m_macCurrentEventHandlerCallRef ;
+    WXEVENTHANDLERREF     m_macEventHandler ;
+    WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;

 #endif
     WXEVENTREF            m_macCurrentEvent ;
 
 public:
 #endif
     WXEVENTREF            m_macCurrentEvent ;
 
 public:

-    static bool           s_macDefaultEncodingIsPC ;

     static bool           s_macSupportPCMenuShortcuts ;
     static long           s_macAboutMenuItemId ;
     static long           s_macPreferencesMenuItemId ;
     static bool           s_macSupportPCMenuShortcuts ;
     static long           s_macAboutMenuItemId ;
     static long           s_macPreferencesMenuItemId ;


@@ -138,15 +134,19 @@ public:
     WXHRGN                m_macCursorRgn ;
     WXHRGN                m_macSleepRgn ;
     WXHRGN                m_macHelpRgn ;
     WXHRGN                m_macCursorRgn ;
     WXHRGN                m_macSleepRgn ;
     WXHRGN                m_macHelpRgn ;

-    
+

     virtual void          MacSuspend( bool convertClipboard ) ;
     virtual void          MacResume( bool convertClipboard ) ;
     virtual void          MacConvertPrivateToPublicScrap() ;
     virtual void          MacConvertPublicToPrivateScrap() ;
     virtual void          MacSuspend( bool convertClipboard ) ;
     virtual void          MacResume( bool convertClipboard ) ;
     virtual void          MacConvertPrivateToPublicScrap() ;
     virtual void          MacConvertPublicToPrivateScrap() ;

-    
+

     void                  MacDoOneEvent() ;
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
     void                  MacHandleOneEvent( WXEVENTREF ev ) ;
     void                  MacDoOneEvent() ;
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
     void                  MacHandleOneEvent( WXEVENTREF ev ) ;

+
+    // For embedded use. By default does nothing.
+    virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
+

 #if !TARGET_CARBON
     virtual void          MacHandleMenuSelect( int menuid , int menuitem ) ;
     virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;
 #if !TARGET_CARBON
     virtual void          MacHandleMenuSelect( int menuid , int menuitem ) ;
     virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;


@@ -161,24 +161,26 @@ public:
     virtual void          MacHandleKeyDownEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleKeyUpEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleHighLevelEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleKeyDownEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleKeyUpEvent( WXEVENTREF ev ) ;
     virtual void          MacHandleHighLevelEvent( WXEVENTREF ev ) ;

-    
+
+#else
+    virtual void          MacHandleMouseMovedEvent( wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) ;

 #endif
 
 #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 ) ;
-    
+    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
     // 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
     // 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
     // in response of a open-application apple event

-    virtual void         MacNewFile() ;
+    virtual void         MacNewFile() ;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -192,16 +194,11 @@ public:
     // opaque pointer for CFragInitBlock
     static void OpenSharedLibraryResource(const void *) ;
     static void CloseSharedLibraryResource() ;
     // opaque pointer for CFragInitBlock
     static void OpenSharedLibraryResource(const void *) ;
     static void CloseSharedLibraryResource() ;

-    
-private:    
+
+private:

     short       m_currentRefNum ;
 } ;
 
     short       m_currentRefNum ;
 } ;
 

-// TODO: add platform-specific arguments
-#ifndef __DARWIN__
-int WXDLLEXPORT wxEntry( int argc, char *argv[] , bool enterLoop = TRUE);
-#endif
-

 #endif
     // _WX_APP_H_
 
 #endif
     // _WX_APP_H_