Fixes for previous fixes

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index ffb6b3d82c703d34281de4cb65629f4fff570b89..e8a604544afecd80180ea6bc002f4ea5391c1083 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -4,17 +4,17 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27
 // 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[] );
-
+// ========================================================================
+// wxApp
+// ========================================================================

 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp: public wxAppBase
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp: public wxAppBase


@@ -35,8 +35,14 @@ public:
     inline WX_NSApplication GetNSApplication() { return m_cocoaApp; }
     void CocoaInstallRequestedIdleHandler() { if(m_isIdle) CocoaInstallIdleHandler(); }
     inline void CocoaRequestIdle() { m_isIdle = true; }
     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();

 protected:
     WX_NSApplication m_cocoaApp;
 protected:
     WX_NSApplication m_cocoaApp;

+    struct objc_object *m_cocoaAppDelegate;
+    WX_NSThread m_cocoaMainThread;

     void CocoaInstallIdleHandler();
     bool m_isIdle;
 
     void CocoaInstallIdleHandler();
     bool m_isIdle;
 


@@ -45,32 +51,28 @@ protected:
 // ------------------------------------------------------------------------
 public:
     // Implement wxAppBase pure virtuals
 // ------------------------------------------------------------------------
 public:
     // Implement wxAppBase pure virtuals

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

     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);

-    virtual bool ProcessIdle();

     virtual void WakeUpIdle() { CocoaRequestIdle(); }
     
     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 bool Initialize(int argc, wxChar **argv);
+    virtual bool Initialize(int& argc, wxChar **argv);

     virtual void CleanUp();
     virtual void CleanUp();

+    virtual bool CallOnInit();
+

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

+
+#ifdef __WXDEBUG__
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);
+    bool IsInAssert() const { return m_isInAssert; }
+#endif // __WXDEBUG__
+
+private:
+#ifdef __WXDEBUG__
+    bool m_isInAssert;
+#endif // __WXDEBUG__

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