Update to Scintilla 1.53

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index ffb6b3d82c703d34281de4cb65629f4fff570b89..ac4078563f0f38c93894aa58f0387cdb0932433c 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -12,9 +12,6 @@
 #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[] );
-

 // 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


@@ -54,20 +51,12 @@ public:
     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();