mac paths updated

[wxWidgets.git] / interface / app.h

diff --git a/interface/app.h b/interface/app.h
index 295b3ba3fa1d3d6300e24ed6630f385c023b666b..cf79e46a128ccc9f74091cd61c2d21ec276583d1 100644 (file)
--- a/interface/app.h
+++ b/interface/app.h
@@ -33,11 +33,6 @@ protected:
 
 public:
 
-    /**
-        Constructor.
-    */
-    wxAppConsole();
-
     /**
         Destructor.
     */
@@ -88,7 +83,7 @@ public:
         e.g. for the file names or configuration file keys.
         By default, returns the same string as GetAppName().
 
-        @wxsince{2.9.0}
+        @since 2.9.0
     */
     wxString GetAppDisplayName() const;
 
@@ -134,7 +129,7 @@ public:
 
         By default, returns the same string as GetVendorName().
 
-        @wxsince{2.9.0}
+        @since 2.9.0
     */
     const wxString& GetVendorDisplayName() const;
 
@@ -165,32 +160,42 @@ public:
     static bool IsMainLoopRunning();
 
     /**
-        Mac specific. Called in response of an "open-application" Apple event.
+        Called in response of an "open-application" Apple event.
         Override this to create a new document in your app.
+
+        @onlyfor{wxmac}
     */
     virtual void MacNewFile();
 
     /**
-        Mac specific. Called in response of an "open-document" Apple event.
+        Called in response of an "open-document" Apple event.
 
         You need to override this method in order to open a document file after the
         user double clicked on it or if the document file was dropped on either the
         running application or the application icon in Finder.
+
+        @onlyfor{wxmac}
     */
     virtual void MacOpenFile(const wxString& fileName);
 
     /**
-        Mac specific. Called in response of a "get-url" Apple event.
+        Called in response of a "get-url" Apple event.
+
+        @onlyfor{wxmac}
     */
     virtual void MacOpenURL(const wxString& url);
 
     /**
-        Mac specific. Called in response of a "print-document" Apple event.
+        Called in response of a "print-document" Apple event.
+
+        @onlyfor{wxmac}
     */
     virtual void MacPrintFile(const wxString& fileName);
 
     /**
-        Mac specific. Called in response of a "reopen-application" Apple event.
+        Called in response of a "reopen-application" Apple event.
+
+        @onlyfor{wxmac}
     */
     virtual void MacReopenApp();
 
@@ -198,8 +203,7 @@ public:
         Called by wxWidgets on creation of the application. Override this if you wish
         to provide your own (environment-dependent) main loop.
 
-        @returns Returns 0 under X, and the wParam of the WM_QUIT message under
-                 Windows.
+        @return 0 under X, and the wParam of the WM_QUIT message under Windows.
     */
     virtual int MainLoop();
 
@@ -225,10 +229,11 @@ public:
             the message specified as argument to wxASSERT_MSG or wxFAIL_MSG, will
             be @NULL if just wxASSERT or wxFAIL was used
     */
-    virtual void OnAssertFailure(const wxChar file, int line,
-                                 const wxChar func,
-                                 const wxChar cond,
-                                 const wxChar msg);
+    virtual void OnAssertFailure(const wxChar *file,
+                                 int line,
+                                 const wxChar *func,
+                                 const wxChar *cond,
+                                 const wxChar *msg);
 
     /**
         Called when command line parsing fails (i.e. an incorrect command line option
@@ -537,7 +542,7 @@ public:
         If this function returns @false and you need to attract users attention to
         the application, you may use wxTopLevelWindow::RequestUserAttention to do it.
     */
-    bool IsActive() const;
+    virtual bool IsActive() const;
 
     /**
         Windows-only function for processing a message. This function is called
@@ -559,6 +564,8 @@ public:
                 return CWinApp::PreTranslateMessage(msg);
         }
         @endcode
+
+        @onlyfor{wxmsw}
     */
     bool ProcessMessage(WXMSG* msg);
 
@@ -573,7 +580,7 @@ public:
 
         @see wxIdleEvent
     */
-    bool SendIdleEvents(wxWindow* win, wxIdleEvent& event);
+    virtual bool SendIdleEvents(wxWindow* win, wxIdleEvent& event);
 
     /**
         Allows the programmer to specify whether the application will exit when the
@@ -657,7 +664,7 @@ public:
     This is used in headers to create a forward declaration of the wxGetApp()
     function implemented by IMPLEMENT_APP().
 
-    It creates the declaration @a className wxGetApp(void).
+    It creates the declaration <tt>className& wxGetApp()</tt>.
 
     @header{wx/app.h}