synchronize GTK2 minimum version in docs

[wxWidgets.git] / interface / wx / app.h

diff --git a/interface/wx/app.h b/interface/wx/app.h
index c17ad1c002b1e1be86fda0ef4e2c6171a96eab94..3261fd74aabf8543ae269b2ecb127337df23171c 100644 (file)
--- a/interface/wx/app.h
+++ b/interface/wx/app.h
@@ -37,7 +37,8 @@
 
     @see @ref overview_app, wxApp, wxAppTraits, wxEventLoopBase
 */
 
     @see @ref overview_app, wxApp, wxAppTraits, wxEventLoopBase
 */

-class wxAppConsole : public wxEvtHandler
+class wxAppConsole : public wxEvtHandler,
+                     public wxEventFilter

 {
 protected:
     /**
 {
 protected:
     /**


@@ -81,13 +82,14 @@ public:
     virtual void ExitMainLoop();
 
     /**
     virtual void ExitMainLoop();
 
     /**

+        Overridden wxEventFilter method.
+

         This function is called before processing any event and allows the application
         This function is called before processing any event and allows the application

-        to preempt the processing of some events.
+        to preempt the processing of some events, see wxEventFilter
+        documentation for more information.

 
 

-        If this method returns -1 the event is processed normally, otherwise either
-        @true or @false should be returned and the event processing stops immediately
-        considering that the event had been already processed (for the former return
-        value) or that it is not going to be processed at all (for the latter one).
+        wxApp implementation of this method always return -1 indicating that
+        the event should be processed normally.

     */
     virtual int FilterEvent(wxEvent& event);
 
     */
     virtual int FilterEvent(wxEvent& event);
 


@@ -633,7 +635,7 @@ public:
 
     /**
         Get display mode that is used use. This is only used in framebuffer
 
     /**
         Get display mode that is used use. This is only used in framebuffer

-        wxWidgets ports (such as wxMGL or wxDFB).
+        wxWidgets ports such as wxDFB.

     */
     virtual wxVideoMode GetDisplayMode() const;
 
     */
     virtual wxVideoMode GetDisplayMode() const;
 


@@ -725,7 +727,7 @@ public:
 
     /**
         Set display mode to use. This is only used in framebuffer wxWidgets
 
     /**
         Set display mode to use. This is only used in framebuffer wxWidgets

-        ports (such as wxMGL or wxDFB).
+        ports such as wxDFB.

     */
     virtual bool SetDisplayMode(const wxVideoMode& info);
 
     */
     virtual bool SetDisplayMode(const wxVideoMode& info);
 


@@ -852,17 +854,6 @@ public:
     */
     virtual void MacReopenApp();
 
     */
     virtual void MacReopenApp();
 

-
-    static long GetMacAboutMenuItemId();
-    static long GetMacPreferencesMenuItemId();
-    static long GetMacExitMenuItemId();
-    static wxString GetMacHelpMenuTitleName();
-
-    static void SetMacAboutMenuItemId(long val);
-    static void SetMacPreferencesMenuItemId(long val);
-    static void SetMacExitMenuItemId(long val);
-    static void SetMacHelpMenuTitleName(const wxString& val);
-

     //@}
 
 };
     //@}
 
 };