correction for Mac OS X

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

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 4d50c75d0612664aa5945445b8fc3408c8bef15c..e28f626e38048cc82029fdf600362ea0d7778d89 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -40,57 +40,26 @@ bool WXDLLEXPORT wxYield();
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
-class WXDLLEXPORT wxApp: public wxEvtHandler
+class WXDLLEXPORT wxApp: public wxAppBase
 {
   DECLARE_DYNAMIC_CLASS(wxApp)
   wxApp();
-  inline ~wxApp() {}
-
-  static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-  static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
+  virtual ~wxApp() {}
 
   virtual int MainLoop();
-  void ExitMainLoop();
-  bool Initialized();
+  virtual void ExitMainLoop();
+  virtual bool Initialized();
   virtual bool Pending() ;
   virtual void Dispatch() ;
 
-  void OnIdle(wxIdleEvent& event);
-
-// Generic
-  virtual bool OnInit() { return FALSE; };
-
-  // No specific tasks to do here.
-  virtual bool OnInitGui() { return TRUE; }
-
-  // Called to set off the main loop
-  virtual int OnRun() { return MainLoop(); };
-  virtual int OnExit() { return 0; }
-
-  inline void SetPrintMode(int mode) { m_printMode = mode; }
-  inline int GetPrintMode() const { return m_printMode; }
-
-  inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-  inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
-
-  inline wxString GetAppName() const {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
+  virtual wxIcon GetStdIcon(int which) const;
+  virtual void SetPrintMode(int mode) { m_printMode = mode; }
+  virtual int GetPrintMode() const { return m_printMode; }
 
-  inline void SetAppName(const wxString& name) { m_appName = name; };
-  inline wxString GetClassName() const { return m_className; }
-  inline void SetClassName(const wxString& name) { m_className = name; }
-
-  void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
-  const wxString& GetVendorName() const { return m_vendorName; }
-
-  wxWindow *GetTopWindow() const ;
-  inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
-
-  inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-  inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
+  // implementation only
+  void OnIdle(wxIdleEvent& event);
+  void OnEndSession(wxCloseEvent& event);
+  void OnQueryEndSession(wxCloseEvent& event);
 
   // Send idle event to all top-level windows.
   // Returns TRUE if more idle time is requested.
@@ -104,27 +73,11 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   inline void SetAuto3D(bool flag) { m_auto3D = flag; }
   inline bool GetAuto3D() const { return m_auto3D; }
 
-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
-
-public:
-  // Will always be set to the appropriate, main-style values.
-  int                   argc;
-  char **               argv;
-
 protected:
-  bool                  m_wantDebugOutput ;
-  wxString              m_className;
-  wxString              m_appName,
-                        m_vendorName;
-  wxWindow *            m_topWindow;
-  bool                  m_exitOnFrameDelete;
   bool                  m_showOnInit;
   int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
   bool                  m_auto3D ;   // Always use 3D controls, except
                                  // where overriden
-  static wxAppInitializerFunction      m_appInitFn;
-
 public:
 
   // Implementation
@@ -133,6 +86,7 @@ public:
 
   void DeletePendingObjects();
   bool ProcessIdle();
+  bool IsExiting() { return !m_keepGoing ; }
 
 public:
   static long           sm_lastMessageTime;
@@ -193,16 +147,16 @@ public :
   virtual void                                 MacHandleHighLevelEvent( EventRecord *ev ) ;
        virtual void                                    MacHandleMenuSelect( int menuid , int menuitem ) ;
 
-       virtual OSErr                                   MacHandleAEODoc(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEPDoc(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEOApp(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEQuit(AppleEvent *event , AppleEvent *reply) ;
+       virtual OSErr                                   MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply) ;
+       virtual OSErr                                   MacHandleAEPDoc(const AppleEvent *event , AppleEvent *reply) ;
+       virtual OSErr                                   MacHandleAEOApp(const AppleEvent *event , AppleEvent *reply) ;
+       virtual OSErr                                   MacHandleAEQuit(const AppleEvent *event , AppleEvent *reply) ;
 
 DECLARE_EVENT_TABLE()
 };
 
 // TODO: add platform-specific arguments
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+int WXDLLEXPORT wxEntry( int argc, char *argv[] , bool enterLoop = TRUE);
 
 void wxMacConvertFromPCForControls( char * p ) ;