removed wxLogTrace() without mask to fix DMC compilation

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index ac4078563f0f38c93894aa58f0387cdb0932433c..e8a604544afecd80180ea6bc002f4ea5391c1083 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -4,14 +4,17 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_APP_H_
 #define _WX_COCOA_APP_H_
 
+// ========================================================================
+// wxApp
+// ========================================================================
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp: public wxAppBase
@@ -32,8 +35,14 @@ 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();
 protected:
     WX_NSApplication m_cocoaApp;
+    struct objc_object *m_cocoaAppDelegate;
+    WX_NSThread m_cocoaMainThread;
     void CocoaInstallIdleHandler();
     bool m_isIdle;
 
@@ -42,12 +51,6 @@ protected:
 // ------------------------------------------------------------------------
 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);
@@ -60,6 +63,16 @@ public:
     
     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_