Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index cb9c7d933ebd85c034f98ead5b4c731f34fed624..839a4e012c5e0da1e474992fd44018602de7d902 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -1,76 +1,74 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/app.h
+// Name:        wx/cocoa/app.h

 // Purpose:     wxApp class
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27
 // Purpose:     wxApp class
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27

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

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_APP_H_
 #define _WX_COCOA_APP_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_APP_H_
 #define _WX_COCOA_APP_H_
 

-// entrypoint
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
+typedef const struct __CFString * CFStringRef;

 
 

+#include "wx/osx/core/cfref.h"
+
+// ========================================================================
+// wxApp
+// ========================================================================

 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 // Represents the application. Derive OnInit and declare
 // a new App object to start application

-class WXDLLEXPORT wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase

 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 {
     DECLARE_DYNAMIC_CLASS(wxApp)

-    DECLARE_EVENT_TABLE()

 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 public:
     wxApp();
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 public:
     wxApp();

-    virtual ~wxApp() {}
+    virtual ~wxApp();

 
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------
 public:
     inline WX_NSApplication GetNSApplication() { return m_cocoaApp; }
 
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------
 public:
     inline WX_NSApplication GetNSApplication() { return m_cocoaApp; }

-    void CocoaInstallRequestedIdleHandler() { if(m_isIdle) CocoaInstallIdleHandler(); }
-    inline void CocoaRequestIdle() { m_isIdle = true; }
+    virtual void CocoaDelegate_applicationWillBecomeActive();
+    virtual void CocoaDelegate_applicationDidBecomeActive();
+    virtual void CocoaDelegate_applicationWillResignActive();
+    virtual void CocoaDelegate_applicationDidResignActive();
+    virtual void CocoaDelegate_applicationWillUpdate();
+    virtual void CF_ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, int activity);

 protected:
     WX_NSApplication m_cocoaApp;
 protected:
     WX_NSApplication m_cocoaApp;

-    void CocoaInstallIdleHandler();
-    bool m_isIdle;
+    struct objc_object *m_cocoaAppDelegate;
+    WX_NSThread m_cocoaMainThread;
+    wxCFRef<CFRunLoopObserverRef> m_cfRunLoopIdleObserver;
+    wxCFRef<CFStringRef> m_cfObservedRunLoopMode;

 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
     // Implement wxAppBase pure virtuals
 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
     // Implement wxAppBase pure virtuals

-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();
-

     virtual void Exit();
 
     virtual void Exit();
 

-    virtual bool Yield(bool onlyIfNeeded = FALSE);
-    virtual bool ProcessIdle();
-    virtual void WakeUpIdle() { CocoaRequestIdle(); }
-    
-    /* Idle Processing */
-    void OnIdle(wxIdleEvent& 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(wxWindowCocoa* win);
-    
+    virtual void WakeUpIdle();
+

     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();

-    
+    virtual bool CallOnInit();
+
+

     virtual bool OnInit();
     virtual bool OnInitGui();
     virtual bool OnInit();
     virtual bool OnInitGui();

+
+    // Set true _before_ initializing wx to force embedded mode (no app delegate, etc.)
+    static bool sm_isEmbedded;

 };
 
 #endif // _WX_COCOA_APP_H_
 };
 
 #endif // _WX_COCOA_APP_H_