cleaning up problems after string changes

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 7caed7e180a9dd1bb30412c0bd8d044347f69848..d0e7c782614656374a41b6e1a4d07085283c67c2 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -33,13 +33,14 @@ public:
 // ------------------------------------------------------------------------
 public:
     inline WX_NSApplication GetNSApplication() { return m_cocoaApp; }
 // ------------------------------------------------------------------------
 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;
 protected:
     WX_NSApplication m_cocoaApp;

+    struct objc_object *m_cocoaAppDelegate;

     WX_NSThread m_cocoaMainThread;
     WX_NSThread m_cocoaMainThread;

-    void CocoaInstallIdleHandler();
-    bool m_isIdle;

 
 // ------------------------------------------------------------------------
 // Implementation
 
 // ------------------------------------------------------------------------
 // Implementation


@@ -49,7 +50,7 @@ public:
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);

-    virtual void WakeUpIdle() { CocoaRequestIdle(); }
+    virtual void WakeUpIdle();

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