Removing more CodeWarrior project files.

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

diff --git a/interface/wx/event.h b/interface/wx/event.h
index 6cc36544063037bcb982718ff62a6f8b0aa9f333..548ceffb062f035eb8a3fc141a11c4406ca72206 100644 (file)
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -23,7 +23,7 @@ enum wxEventPropagation
 /**
     The different categories for a wxEvent; see wxEvent::GetEventCategory.
 
 /**
     The different categories for a wxEvent; see wxEvent::GetEventCategory.
 

-    @note They are used as OR-combinable flags by wxApp::Yield.
+    @note They are used as OR-combinable flags by wxEventLoopBase::YieldFor.

 */
 enum wxEventCategory
 {
 */
 enum wxEventCategory
 {


@@ -54,12 +54,13 @@ enum wxEventCategory
         This category is for any event used to send notifications from the
         secondary threads to the main one or in general for notifications among
         different threads (which may or may not be user-generated).
         This category is for any event used to send notifications from the
         secondary threads to the main one or in general for notifications among
         different threads (which may or may not be user-generated).

+        See e.g. wxThreadEvent.

     */
     wxEVT_CATEGORY_THREAD = 16,
 
     /**
     */
     wxEVT_CATEGORY_THREAD = 16,
 
     /**

-        This mask is used in wxApp::Yield to specify that all event categories should
-        be processed.
+        This mask is used in wxEventLoopBase::YieldFor to specify that all event
+        categories should be processed.

     */
     wxEVT_CATEGORY_ALL =
         wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT|wxEVT_CATEGORY_SOCKET| \
     */
     wxEVT_CATEGORY_ALL =
         wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT|wxEVT_CATEGORY_SOCKET| \


@@ -147,8 +148,9 @@ public:
 
     /**
         Returns a generic category for this event.
 
     /**
         Returns a generic category for this event.

+        wxEvent implementation returns @c wxEVT_CATEGORY_UI by default.

 
 

-        This function is used to selectively process events in wxApp::Yield.
+        This function is used to selectively process events in wxEventLoopBase::YieldFor.

     */
     virtual wxEventCategory GetEventCategory() const;
 
     */
     virtual wxEventCategory GetEventCategory() const;
 


@@ -331,7 +333,7 @@ public:
     @library{wxbase}
     @category{events}
 
     @library{wxbase}
     @category{events}
 

-    @see @ref overview_events_processing
+    @see @ref overview_events_processing, wxEventBlocker, wxEventLoopBase

 */
 class wxEvtHandler : public wxObject
 {
 */
 class wxEvtHandler : public wxObject
 {


@@ -378,7 +380,7 @@ public:
         fields of this object are used by it, notably any wxString members of
         the event object must not be shallow copies of another wxString object
         as this would result in them still using the same string buffer behind
         fields of this object are used by it, notably any wxString members of
         the event object must not be shallow copies of another wxString object
         as this would result in them still using the same string buffer behind

-        the scenes. For example
+        the scenes. For example:

         @code
             void FunctionInAWorkerThread(const wxString& str)
             {
         @code
             void FunctionInAWorkerThread(const wxString& str)
             {


@@ -391,6 +393,20 @@ public:
             }
         @endcode
 
             }
         @endcode
 

+        Note that you can use wxThreadEvent instead of wxCommandEvent
+        to avoid this problem:
+        @code
+            void FunctionInAWorkerThread(const wxString& str)
+            {
+                wxThreadEvent evt;
+                evt->SetString(str);
+
+                // wxThreadEvent::Clone() makes sure that the internal wxString
+                // member is not shared by other wxString instances:
+                wxTheApp->QueueEvent( evt.Clone() );
+            }
+        @endcode
+

         Finally notice that this method automatically wakes up the event loop
         if it is currently idle by calling ::wxWakeUpIdle() so there is no need
         to do it manually when using it.
         Finally notice that this method automatically wakes up the event loop
         if it is currently idle by calling ::wxWakeUpIdle() so there is no need
         to do it manually when using it.


@@ -437,45 +453,72 @@ public:
         (such as a new control) where you define new event types, as opposed to
         allowing the user to override virtual functions.
 
         (such as a new control) where you define new event types, as opposed to
         allowing the user to override virtual functions.
 

-        An instance where you might actually override the ProcessEvent() function is where
-        you want to direct event processing to event handlers not normally noticed by
-        wxWidgets. For example, in the document/view architecture, documents and views
-        are potential event handlers. When an event reaches a frame, ProcessEvent() will
-        need to be called on the associated document and view in case event handler functions
-        are associated with these objects. The property classes library (wxProperty) also
-        overrides ProcessEvent() for similar reasons.
+        Notice that you don't usually need to override ProcessEvent() to
+        customize the event handling, overriding the specially provided
+        TryBefore() and TryAfter() functions is usually enough. For example,
+        wxMDIParentFrame may override TryBefore() to ensure that the menu
+        events are processed in the active child frame before being processed
+        in the parent frame itself.

 
         The normal order of event table searching is as follows:
 
         The normal order of event table searching is as follows:

+        -# wxApp::FilterEvent() is called. If it returns anything but @c -1
+           (default) the processing stops here.

         -# If the object is disabled (via a call to wxEvtHandler::SetEvtHandlerEnabled)
         -# If the object is disabled (via a call to wxEvtHandler::SetEvtHandlerEnabled)

-           the function skips to step (6).
-        -# If the object is a wxWindow, ProcessEvent() is recursively called on the
-           window's wxValidator. If this returns @true, the function exits.
-        -# SearchEventTable() is called for this event handler. If this fails, the base
-           class table is tried, and so on until no more tables exist or an appropriate
-           function was found, in which case the function exits.
+           the function skips to step (7).
+        -# TryBefore() is called (this is where wxValidator are taken into
+           account for wxWindow objects). If this returns @true, the function exits.
+        -# Dynamic event table of the handlers connected using Connect() is
+           searched. If a handler is found, it is executed and the function
+           returns @true unless the handler used wxEvent::Skip() to indicate
+           that it didn't handle the event in which case the search continues.
+        -# Static events table of the handlers connected using event table
+           macros is searched for this event handler. If this fails, the base
+           class event table table is tried, and so on until no more tables
+           exist or an appropriate function was found. If a handler is found,
+           the same logic as in the previous step applies.

         -# The search is applied down the entire chain of event handlers (usually the
            chain has a length of one). This chain can be formed using wxEvtHandler::SetNextHandler():
         -# The search is applied down the entire chain of event handlers (usually the
            chain has a length of one). This chain can be formed using wxEvtHandler::SetNextHandler():

-              @image html overview_eventhandling_chain.png
+              @image html overview_events_chain.png

            (referring to the image, if @c A->ProcessEvent is called and it doesn't handle
             the event, @c B->ProcessEvent will be called and so on...).
            Note that in the case of wxWindow you can build a stack of event handlers
            (see wxWindow::PushEventHandler() for more info).
            If any of the handlers of the chain return @true, the function exits.
            (referring to the image, if @c A->ProcessEvent is called and it doesn't handle
             the event, @c B->ProcessEvent will be called and so on...).
            Note that in the case of wxWindow you can build a stack of event handlers
            (see wxWindow::PushEventHandler() for more info).
            If any of the handlers of the chain return @true, the function exits.

-        -# If the object is a wxWindow and the event is a wxCommandEvent, ProcessEvent()
-           is recursively applied to the parent window's event handler.
-           If this returns @true, the function exits.
-        -# Finally, ProcessEvent() is called on the wxApp object.
+        -# TryAfter() is called: for the wxWindow object this may propagate the
+           event to the window parent (recursively). If the event is still not
+           processed, ProcessEvent() on wxTheApp object is called as the last
+           step.
+
+        Notice that steps (2)-(6) are performed in ProcessEventHere() which is
+        called by this function.

 
         @param event
             Event to process.
 
         @param event
             Event to process.

-
-        @return @true if a suitable event handler function was found and
-                 executed, and the function did not call wxEvent::Skip.
+        @return
+            @true if a suitable event handler function was found and executed,
+            and the function did not call wxEvent::Skip.

 
         @see SearchEventTable()
     */
     virtual bool ProcessEvent(wxEvent& event);
 
 
         @see SearchEventTable()
     */
     virtual bool ProcessEvent(wxEvent& event);
 

+    /**
+        Try to process the event in this event handler.
+
+        This method is called from ProcessEvent(), please see the detailed
+        description of the event processing logic there.
+
+        It is @em not virtual and so may not be overridden but it does call
+        virtual TryBefore() which may be overridden.
+
+        @param event
+            Event to process.
+        @return
+            @true if this object itself defines a handler for this event and
+            the handler didn't skip the event.
+     */
+    bool ProcessEventHere(wxEvent& event);
+

     /**
         Processes an event by calling ProcessEvent() and handles any exceptions
         that occur in the process.
     /**
         Processes an event by calling ProcessEvent() and handles any exceptions
         that occur in the process.


@@ -490,7 +533,32 @@ public:
         @see wxWindow::HandleWindowEvent
     */
     bool SafelyProcessEvent(wxEvent& event);
         @see wxWindow::HandleWindowEvent
     */
     bool SafelyProcessEvent(wxEvent& event);

+    
+    /**
+        Processes the pending events previously queued using QueueEvent() or 
+        AddPendingEvent(); you must call this function only if you are sure
+        there are pending events for this handler, otherwise a @c wxCHECK
+        will fail.
+        
+        The real processing still happens in ProcessEvent() which is called by this
+        function.
+        
+        Note that this function needs a valid application object (see 
+        wxAppConsole::GetInstance()) because wxApp holds the list of the event
+        handlers with pending events and this function manipulates that list.
+    */
+    void ProcessPendingEvents();

 
 

+    /**
+        Deletes all events queued on this event handler using QueueEvent() or
+        AddPendingEvent().
+        
+        Use with care because the events which are deleted are (obviously) not
+        processed and this may have unwanted consequences (e.g. user actions events
+        will be lost).
+    */
+    void DeletePendingEvents();
+    

     /**
         Searches the event table, executing an event handler function if an appropriate
         one is found.
     /**
         Searches the event table, executing an event handler function if an appropriate
         one is found.


@@ -512,6 +580,9 @@ public:
 
                  If a suitable function is called but calls wxEvent::Skip, this
                  function will fail, and searching will continue.
 
                  If a suitable function is called but calls wxEvent::Skip, this
                  function will fail, and searching will continue.

+                 
+         @todo this function in the header is listed as an "implementation only" function;
+               are we sure we want to document it?

 
         @see ProcessEvent()
     */
 
         @see ProcessEvent()
     */


@@ -805,6 +876,66 @@ public:
     bool IsUnlinked() const;
 
     //@}
     bool IsUnlinked() const;
 
     //@}

+
+protected:
+    /**
+        Method called by ProcessEvent() before examining this object event
+        tables.
+
+        This method can be overridden to hook into the event processing logic
+        as early as possible. You should usually call the base class version
+        when overriding this method, even if wxEvtHandler itself does nothing
+        here, some derived classes do use this method, e.g. wxWindow implements
+        support for wxValidator in it.
+
+        Example:
+        @code
+        class MyClass : public BaseClass // inheriting from wxEvtHandler
+        {
+        ...
+        protected:
+            virtual bool TryBefore(wxEvent& event)
+            {
+                if ( MyPreProcess(event) )
+                    return true;
+
+                return BaseClass::TryBefore(event);
+            }
+        };
+        @endcode
+
+        @see ProcessEvent(), ProcessEventHere()
+     */
+    virtual bool TryBefore(wxEvent& event);
+
+    /**
+        Method called by ProcessEvent() as last resort.
+
+        This method can be overridden to implement post-processing for the
+        events which were not processed anywhere else.
+
+        The base class version handles forwarding the unprocessed events to
+        wxApp at wxEvtHandler level and propagating them upwards the window
+        child-parent chain at wxWindow level and so should usually be called
+        when overriding this method:
+        @code
+        class MyClass : public BaseClass // inheriting from wxEvtHandler
+        {
+        ...
+        protected:
+            virtual bool TryAfter(wxEvent& event)
+            {
+                if ( BaseClass::TryAfter(event) )
+                    return true;
+
+                return MyPostProcess(event);
+            }
+        };
+        @endcode
+
+        @see ProcessEvent(), ProcessEventHere()
+     */
+    virtual bool TryAfter(wxEvent& event);

 };
 
 
 };
 
 


@@ -869,11 +1000,11 @@ public:
 
     @beginEventTable{wxKeyEvent}
     @event{EVT_KEY_DOWN(func)}
 
     @beginEventTable{wxKeyEvent}
     @event{EVT_KEY_DOWN(func)}

-           Process a wxEVT_KEY_DOWN event (any key has been pressed).
+        Process a @c wxEVT_KEY_DOWN event (any key has been pressed).

     @event{EVT_KEY_UP(func)}
     @event{EVT_KEY_UP(func)}

-           Process a wxEVT_KEY_UP event (any key has been released).
+        Process a @c wxEVT_KEY_UP event (any key has been released).

     @event{EVT_CHAR(func)}
     @event{EVT_CHAR(func)}

-           Process a wxEVT_CHAR event.
+        Process a @c wxEVT_CHAR event.

     @endEventTable
 
     @see wxKeyboardState
     @endEventTable
 
     @see wxKeyboardState


@@ -956,15 +1087,15 @@ public:
     events received by windows.
 
     @beginEventTable{wxJoystickEvent}
     events received by windows.
 
     @beginEventTable{wxJoystickEvent}

-    @style{EVT_JOY_BUTTON_DOWN(func)}
-        Process a wxEVT_JOY_BUTTON_DOWN event.
-    @style{EVT_JOY_BUTTON_UP(func)}
-        Process a wxEVT_JOY_BUTTON_UP event.
-    @style{EVT_JOY_MOVE(func)}
-        Process a wxEVT_JOY_MOVE event.
-    @style{EVT_JOY_ZMOVE(func)}
-        Process a wxEVT_JOY_ZMOVE event.
-    @style{EVT_JOYSTICK_EVENTS(func)}
+    @event{EVT_JOY_BUTTON_DOWN(func)}
+        Process a @c wxEVT_JOY_BUTTON_DOWN event.
+    @event{EVT_JOY_BUTTON_UP(func)}
+        Process a @c wxEVT_JOY_BUTTON_UP event.
+    @event{EVT_JOY_MOVE(func)}
+        Process a @c wxEVT_JOY_MOVE event.
+    @event{EVT_JOY_ZMOVE(func)}
+        Process a @c wxEVT_JOY_ZMOVE event.
+    @event{EVT_JOYSTICK_EVENTS(func)}

         Processes all joystick events.
     @endEventTable
 
         Processes all joystick events.
     @endEventTable
 


@@ -1066,10 +1197,10 @@ public:
 
     A scroll event holds information about events sent from scrolling windows.
 
 
     A scroll event holds information about events sent from scrolling windows.
 

+    Note that you can use the EVT_SCROLLWIN* macros for intercepting scroll window events
+    from the receiving window.

 
     @beginEventTable{wxScrollWinEvent}
 
     @beginEventTable{wxScrollWinEvent}

-    You can use the EVT_SCROLLWIN* macros for intercepting scroll window events
-    from the receiving window.

     @event{EVT_SCROLLWIN(func)}
         Process all scroll events.
     @event{EVT_SCROLLWIN_TOP(func)}
     @event{EVT_SCROLLWIN(func)}
         Process all scroll events.
     @event{EVT_SCROLLWIN_TOP(func)}


@@ -1140,7 +1271,7 @@ public:
 
     @beginEventTable{wxSysColourChangedEvent}
     @event{EVT_SYS_COLOUR_CHANGED(func)}
 
     @beginEventTable{wxSysColourChangedEvent}
     @event{EVT_SYS_COLOUR_CHANGED(func)}

-        Process a wxEVT_SYS_COLOUR_CHANGED event.
+        Process a @c wxEVT_SYS_COLOUR_CHANGED event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -1170,7 +1301,7 @@ public:
 
     @beginEventTable{wxWindowCreateEvent}
     @event{EVT_WINDOW_CREATE(func)}
 
     @beginEventTable{wxWindowCreateEvent}
     @event{EVT_WINDOW_CREATE(func)}

-        Process a wxEVT_CREATE event.
+        Process a @c wxEVT_CREATE event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -1254,7 +1385,7 @@ public:
 
     @beginEventTable{wxPaintEvent}
     @event{EVT_PAINT(func)}
 
     @beginEventTable{wxPaintEvent}
     @event{EVT_PAINT(func)}

-        Process a wxEVT_PAINT event.
+        Process a @c wxEVT_PAINT event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -1282,7 +1413,7 @@ public:
 
     @beginEventTable{wxMaximizeEvent}
     @event{EVT_MAXIMIZE(func)}
 
     @beginEventTable{wxMaximizeEvent}
     @event{EVT_MAXIMIZE(func)}

-        Process a wxEVT_MAXIMIZE event.
+        Process a @c wxEVT_MAXIMIZE event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -1361,9 +1492,9 @@ enum wxUpdateUIMode
 
     @beginEventTable{wxUpdateUIEvent}
     @event{EVT_UPDATE_UI(id, func)}
 
     @beginEventTable{wxUpdateUIEvent}
     @event{EVT_UPDATE_UI(id, func)}

-        Process a wxEVT_UPDATE_UI event for the command with the given id.
+        Process a @c wxEVT_UPDATE_UI event for the command with the given id.

     @event{EVT_UPDATE_UI_RANGE(id1, id2, func)}
     @event{EVT_UPDATE_UI_RANGE(id1, id2, func)}

-        Process a wxEVT_UPDATE_UI event for any command with id included in the given range.
+        Process a @c wxEVT_UPDATE_UI event for any command with id included in the given range.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -1610,45 +1741,45 @@ public:
 
     @beginEventTable{wxMouseEvent}
     @event{EVT_LEFT_DOWN(func)}
 
     @beginEventTable{wxMouseEvent}
     @event{EVT_LEFT_DOWN(func)}

-        Process a wxEVT_LEFT_DOWN event. The handler of this event should normally
+        Process a @c wxEVT_LEFT_DOWN event. The handler of this event should normally

         call event.Skip() to allow the default processing to take place as otherwise
         the window under mouse wouldn't get the focus.
     @event{EVT_LEFT_UP(func)}
         call event.Skip() to allow the default processing to take place as otherwise
         the window under mouse wouldn't get the focus.
     @event{EVT_LEFT_UP(func)}

-        Process a wxEVT_LEFT_UP event.
+        Process a @c wxEVT_LEFT_UP event.

     @event{EVT_LEFT_DCLICK(func)}
     @event{EVT_LEFT_DCLICK(func)}

-        Process a wxEVT_LEFT_DCLICK event.
+        Process a @c wxEVT_LEFT_DCLICK event.

     @event{EVT_MIDDLE_DOWN(func)}
     @event{EVT_MIDDLE_DOWN(func)}

-        Process a wxEVT_MIDDLE_DOWN event.
+        Process a @c wxEVT_MIDDLE_DOWN event.

     @event{EVT_MIDDLE_UP(func)}
     @event{EVT_MIDDLE_UP(func)}

-        Process a wxEVT_MIDDLE_UP event.
+        Process a @c wxEVT_MIDDLE_UP event.

     @event{EVT_MIDDLE_DCLICK(func)}
     @event{EVT_MIDDLE_DCLICK(func)}

-        Process a wxEVT_MIDDLE_DCLICK event.
+        Process a @c wxEVT_MIDDLE_DCLICK event.

     @event{EVT_RIGHT_DOWN(func)}
     @event{EVT_RIGHT_DOWN(func)}

-        Process a wxEVT_RIGHT_DOWN event.
+        Process a @c wxEVT_RIGHT_DOWN event.

     @event{EVT_RIGHT_UP(func)}
     @event{EVT_RIGHT_UP(func)}

-        Process a wxEVT_RIGHT_UP event.
+        Process a @c wxEVT_RIGHT_UP event.

     @event{EVT_RIGHT_DCLICK(func)}
     @event{EVT_RIGHT_DCLICK(func)}

-        Process a wxEVT_RIGHT_DCLICK event.
+        Process a @c wxEVT_RIGHT_DCLICK event.

     @event{EVT_MOUSE_AUX1_DOWN(func)}
     @event{EVT_MOUSE_AUX1_DOWN(func)}

-        Process a wxEVT_MOUSE_AUX1_DOWN event.
+        Process a @c wxEVT_MOUSE_AUX1_DOWN event.

     @event{EVT_MOUSE_AUX1_UP(func)}
     @event{EVT_MOUSE_AUX1_UP(func)}

-        Process a wxEVT_MOUSE_AUX1_UP event.
+        Process a @c wxEVT_MOUSE_AUX1_UP event.

     @event{EVT_MOUSE_AUX1_DCLICK(func)}
     @event{EVT_MOUSE_AUX1_DCLICK(func)}

-        Process a wxEVT_MOUSE_AUX1_DCLICK event.
+        Process a @c wxEVT_MOUSE_AUX1_DCLICK event.

     @event{EVT_MOUSE_AUX2_DOWN(func)}
     @event{EVT_MOUSE_AUX2_DOWN(func)}

-        Process a wxEVT_MOUSE_AUX2_DOWN event.
+        Process a @c wxEVT_MOUSE_AUX2_DOWN event.

     @event{EVT_MOUSE_AUX2_UP(func)}
     @event{EVT_MOUSE_AUX2_UP(func)}

-        Process a wxEVT_MOUSE_AUX2_UP event.
+        Process a @c wxEVT_MOUSE_AUX2_UP event.

     @event{EVT_MOUSE_AUX2_DCLICK(func)}
     @event{EVT_MOUSE_AUX2_DCLICK(func)}

-        Process a wxEVT_MOUSE_AUX2_DCLICK event.
+        Process a @c wxEVT_MOUSE_AUX2_DCLICK event.

     @event{EVT_MOTION(func)}
     @event{EVT_MOTION(func)}

-        Process a wxEVT_MOTION event.
+        Process a @c wxEVT_MOTION event.

     @event{EVT_ENTER_WINDOW(func)}
     @event{EVT_ENTER_WINDOW(func)}

-        Process a wxEVT_ENTER_WINDOW event.
+        Process a @c wxEVT_ENTER_WINDOW event.

     @event{EVT_LEAVE_WINDOW(func)}
     @event{EVT_LEAVE_WINDOW(func)}

-        Process a wxEVT_LEAVE_WINDOW event.
+        Process a @c wxEVT_LEAVE_WINDOW event.

     @event{EVT_MOUSEWHEEL(func)}
     @event{EVT_MOUSEWHEEL(func)}

-        Process a wxEVT_MOUSEWHEEL event.
+        Process a @c wxEVT_MOUSEWHEEL event.

     @event{EVT_MOUSE_EVENTS(func)}
         Process all mouse events.
     @endEventTable
     @event{EVT_MOUSE_EVENTS(func)}
         Process all mouse events.
     @endEventTable


@@ -1986,7 +2117,7 @@ public:
 
     @beginEventTable{wxDropFilesEvent}
     @event{EVT_DROP_FILES(func)}
 
     @beginEventTable{wxDropFilesEvent}
     @event{EVT_DROP_FILES(func)}

-        Process a wxEVT_DROP_FILES event.
+        Process a @c wxEVT_DROP_FILES event.

     @endEventTable
 
     @onlyfor{wxmsw}
     @endEventTable
 
     @onlyfor{wxmsw}


@@ -2030,6 +2161,11 @@ public:
     This event class contains information about command events, which originate
     from a variety of simple controls.
 
     This event class contains information about command events, which originate
     from a variety of simple controls.
 

+    Note that wxCommandEvents and wxCommandEvent-derived event classes by default
+    and unlike other wxEvent-derived classes propagate upward from the source
+    window (the window which emits the event) up to the first parent which processes
+    the event. Be sure to read @ref overview_events_propagation.
+

     More complex controls, such as wxTreeCtrl, have separate command event classes.
 
     @beginEventTable{wxCommandEvent}
     More complex controls, such as wxTreeCtrl, have separate command event classes.
 
     @beginEventTable{wxCommandEvent}


@@ -2221,9 +2357,10 @@ public:
 
     @beginEventTable{wxActivateEvent}
     @event{EVT_ACTIVATE(func)}
 
     @beginEventTable{wxActivateEvent}
     @event{EVT_ACTIVATE(func)}

-        Process a wxEVT_ACTIVATE event.
+        Process a @c wxEVT_ACTIVATE event.

     @event{EVT_ACTIVATE_APP(func)}
     @event{EVT_ACTIVATE_APP(func)}

-        Process a wxEVT_ACTIVATE_APP event.
+        Process a @c wxEVT_ACTIVATE_APP event.
+        This event is received by the wxApp-derived instance only.

     @event{EVT_HIBERNATE(func)}
         Process a hibernate event, supplying the member function. This event applies
         to wxApp only, and only on Windows SmartPhone and PocketPC.
     @event{EVT_HIBERNATE(func)}
         Process a hibernate event, supplying the member function. This event applies
         to wxApp only, and only on Windows SmartPhone and PocketPC.


@@ -2232,7 +2369,6 @@ public:
         a wxEVT_ACTIVATE or wxEVT_ACTIVATE_APP event.
     @endEventTable
 
         a wxEVT_ACTIVATE or wxEVT_ACTIVATE_APP event.
     @endEventTable
 

-

     @library{wxcore}
     @category{events}
 
     @library{wxcore}
     @category{events}
 


@@ -2259,7 +2395,7 @@ public:
     @class wxContextMenuEvent
 
     This class is used for context menu events, sent to give
     @class wxContextMenuEvent
 
     This class is used for context menu events, sent to give

-    the application a chance to show a context (popup) menu.
+    the application a chance to show a context (popup) menu for a wxWindow.

 
     Note that if wxContextMenuEvent::GetPosition returns wxDefaultPosition, this
     means that the event originated from a keyboard context button event, and you
 
     Note that if wxContextMenuEvent::GetPosition returns wxDefaultPosition, this
     means that the event originated from a keyboard context button event, and you


@@ -2333,7 +2469,7 @@ public:
 
     @beginEventTable{wxEraseEvent}
     @event{EVT_ERASE_BACKGROUND(func)}
 
     @beginEventTable{wxEraseEvent}
     @event{EVT_ERASE_BACKGROUND(func)}

-        Process a wxEVT_ERASE_BACKGROUND event.
+        Process a @c wxEVT_ERASE_BACKGROUND event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -2369,9 +2505,9 @@ public:
 
     @beginEventTable{wxFocusEvent}
     @event{EVT_SET_FOCUS(func)}
 
     @beginEventTable{wxFocusEvent}
     @event{EVT_SET_FOCUS(func)}

-        Process a wxEVT_SET_FOCUS event.
+        Process a @c wxEVT_SET_FOCUS event.

     @event{EVT_KILL_FOCUS(func)}
     @event{EVT_KILL_FOCUS(func)}

-        Process a wxEVT_KILL_FOCUS event.
+        Process a @c wxEVT_KILL_FOCUS event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -2411,7 +2547,7 @@ public:
 
     @beginEventTable{wxChildFocusEvent}
     @event{EVT_CHILD_FOCUS(func)}
 
     @beginEventTable{wxChildFocusEvent}
     @event{EVT_CHILD_FOCUS(func)}

-        Process a wxEVT_CHILD_FOCUS event.
+        Process a @c wxEVT_CHILD_FOCUS event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -2458,7 +2594,7 @@ public:
 
     @beginEventTable{wxMouseCaptureLostEvent}
     @event{EVT_MOUSE_CAPTURE_LOST(func)}
 
     @beginEventTable{wxMouseCaptureLostEvent}
     @event{EVT_MOUSE_CAPTURE_LOST(func)}

-        Process a wxEVT_MOUSE_CAPTURE_LOST event.
+        Process a @c wxEVT_MOUSE_CAPTURE_LOST event.

     @endEventTable
 
     @onlyfor{wxmsw}
     @endEventTable
 
     @onlyfor{wxmsw}


@@ -2467,7 +2603,7 @@ public:
     @category{events}
 
     @see wxMouseCaptureChangedEvent, @ref overview_events,
     @category{events}
 
     @see wxMouseCaptureChangedEvent, @ref overview_events,

-    wxWindow::CaptureMouse, wxWindow::ReleaseMouse, wxWindow::GetCapture
+         wxWindow::CaptureMouse, wxWindow::ReleaseMouse, wxWindow::GetCapture

 */
 class wxMouseCaptureLostEvent : public wxEvent
 {
 */
 class wxMouseCaptureLostEvent : public wxEvent
 {


@@ -2534,10 +2670,16 @@ public:
     This class adds some simple functionalities to wxCommandEvent coinceived
     for inter-threads communications.
 
     This class adds some simple functionalities to wxCommandEvent coinceived
     for inter-threads communications.
 

+    This event is not natively emitted by any control/class: this is just
+    an helper class for the user.
+    Its most important feature is the GetEventCategory() implementation which
+    allows thread events to @b NOT be processed by wxEventLoopBase::YieldFor calls
+    (unless the @c wxEVT_CATEGORY_THREAD is specified - which is never in wx code).
+

     @library{wxcore}
     @library{wxcore}

-    @category{events}
+    @category{events,threading}

 
 

-    @see @ref overview_thread, wxApp::YieldFor
+    @see @ref overview_thread, wxEventLoopBase::YieldFor

 */
 class wxThreadEvent : public wxCommandEvent
 {
 */
 class wxThreadEvent : public wxCommandEvent
 {


@@ -2558,7 +2700,7 @@ public:
         Returns @c wxEVT_CATEGORY_THREAD.
 
         This is important to avoid unwanted processing of thread events
         Returns @c wxEVT_CATEGORY_THREAD.
 
         This is important to avoid unwanted processing of thread events

-        when calling wxApp::YieldFor().
+        when calling wxEventLoopBase::YieldFor().

     */
     virtual wxEventCategory GetEventCategory() const;
 };
     */
     virtual wxEventCategory GetEventCategory() const;
 };


@@ -2587,9 +2729,9 @@ public:
 
     @beginEventTable{wxHelpEvent}
     @event{EVT_HELP(id, func)}
 
     @beginEventTable{wxHelpEvent}
     @event{EVT_HELP(id, func)}

-        Process a wxEVT_HELP event.
+        Process a @c wxEVT_HELP event.

     @event{EVT_HELP_RANGE(id1, id2, func)}
     @event{EVT_HELP_RANGE(id1, id2, func)}

-        Process a wxEVT_HELP event for a range of ids.
+        Process a @c wxEVT_HELP event for a range of ids.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -2794,7 +2936,7 @@ enum wxIdleMode
 
     @beginEventTable{wxIdleEvent}
     @event{EVT_IDLE(func)}
 
     @beginEventTable{wxIdleEvent}
     @event{EVT_IDLE(func)}

-        Process a wxEVT_IDLE event.
+        Process a @c wxEVT_IDLE event.

     @endEventTable
 
     @library{wxbase}
     @endEventTable
 
     @library{wxbase}


@@ -2880,7 +3022,7 @@ public:
 
     @beginEventTable{wxInitDialogEvent}
     @event{EVT_INIT_DIALOG(func)}
 
     @beginEventTable{wxInitDialogEvent}
     @event{EVT_INIT_DIALOG(func)}

-        Process a wxEVT_INIT_DIALOG event.
+        Process a @c wxEVT_INIT_DIALOG event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -2938,18 +3080,6 @@ public:
 };
 
 
 };
 
 

-/**
-    The possible flag values for a wxNavigationKeyEvent.
-*/
-enum wxNavigationKeyEventFlags
-{
-    wxNKEF_IS_BACKWARD = 0x0000,
-    wxNKEF_IS_FORWARD = 0x0001,
-    wxNKEF_WINCHANGE = 0x0002,
-    wxNKEF_FROMTAB = 0x0004
-};
-
-

 /**
     @class wxNavigationKeyEvent
 
 /**
     @class wxNavigationKeyEvent
 


@@ -2974,6 +3104,17 @@ enum wxNavigationKeyEventFlags
 class wxNavigationKeyEvent : public wxEvent
 {
 public:
 class wxNavigationKeyEvent : public wxEvent
 {
 public:

+    /**
+        Flags which can be used with wxNavigationKeyEvent.
+    */
+    enum wxNavigationKeyEventFlags
+    {
+        IsBackward = 0x0000,
+        IsForward = 0x0001,
+        WinChange = 0x0002,
+        FromTab = 0x0004
+    };
+

     wxNavigationKeyEvent();
     wxNavigationKeyEvent(const wxNavigationKeyEvent& event);
 
     wxNavigationKeyEvent();
     wxNavigationKeyEvent(const wxNavigationKeyEvent& event);
 


@@ -3033,7 +3174,7 @@ public:
     @class wxMouseCaptureChangedEvent
 
     An mouse capture changed event is sent to a window that loses its
     @class wxMouseCaptureChangedEvent
 
     An mouse capture changed event is sent to a window that loses its

-    mouse capture. This is called even if wxWindow::ReleaseCapture
+    mouse capture. This is called even if wxWindow::ReleaseMouse

     was called by the application code. Handling this event allows
     an application to cater for unexpected capture releases which
     might otherwise confuse mouse handling code.
     was called by the application code. Handling this event allows
     an application to cater for unexpected capture releases which
     might otherwise confuse mouse handling code.


@@ -3042,14 +3183,14 @@ public:
 
     @beginEventTable{wxMouseCaptureChangedEvent}
     @event{EVT_MOUSE_CAPTURE_CHANGED(func)}
 
     @beginEventTable{wxMouseCaptureChangedEvent}
     @event{EVT_MOUSE_CAPTURE_CHANGED(func)}

-        Process a wxEVT_MOUSE_CAPTURE_CHANGED event.
+        Process a @c wxEVT_MOUSE_CAPTURE_CHANGED event.

     @endEventTable
 
     @library{wxcore}
     @category{events}
 
     @see wxMouseCaptureLostEvent, @ref overview_events,
     @endEventTable
 
     @library{wxcore}
     @category{events}
 
     @see wxMouseCaptureLostEvent, @ref overview_events,

-    wxWindow::CaptureMouse, wxWindow::ReleaseMouse, wxWindow::GetCapture
+         wxWindow::CaptureMouse, wxWindow::ReleaseMouse, wxWindow::GetCapture

 */
 class wxMouseCaptureChangedEvent : public wxEvent
 {
 */
 class wxMouseCaptureChangedEvent : public wxEvent
 {


@@ -3253,7 +3394,7 @@ public:
 
     @beginEventTable{wxShowEvent}
     @event{EVT_SHOW(func)}
 
     @beginEventTable{wxShowEvent}
     @event{EVT_SHOW(func)}

-        Process a wxEVT_SHOW event.
+        Process a @c wxEVT_SHOW event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -3301,7 +3442,7 @@ public:
 
     @beginEventTable{wxIconizeEvent}
     @event{EVT_ICONIZE(func)}
 
     @beginEventTable{wxIconizeEvent}
     @event{EVT_ICONIZE(func)}

-        Process a wxEVT_ICONIZE event.
+        Process a @c wxEVT_ICONIZE event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -3335,16 +3476,16 @@ public:
 /**
     @class wxMoveEvent
 
 /**
     @class wxMoveEvent
 

-    A move event holds information about move change events.
+    A move event holds information about wxTopLevelWindow move change events.

 
     @beginEventTable{wxMoveEvent}
     @event{EVT_MOVE(func)}
 
     @beginEventTable{wxMoveEvent}
     @event{EVT_MOVE(func)}

-        Process a wxEVT_MOVE event, which is generated when a window is moved.
+        Process a @c wxEVT_MOVE event, which is generated when a window is moved.

     @event{EVT_MOVE_START(func)}
     @event{EVT_MOVE_START(func)}

-        Process a wxEVT_MOVE_START event, which is generated when the user starts
+        Process a @c wxEVT_MOVE_START event, which is generated when the user starts

         to move or size a window. wxMSW only.
     @event{EVT_MOVE_END(func)}
         to move or size a window. wxMSW only.
     @event{EVT_MOVE_END(func)}

-        Process a wxEVT_MOVE_END event, which is generated when the user stops
+        Process a @c wxEVT_MOVE_END event, which is generated when the user stops

         moving or sizing a window. wxMSW only.
     @endEventTable
 
         moving or sizing a window. wxMSW only.
     @endEventTable
 


@@ -3371,7 +3512,7 @@ public:
 /**
     @class wxSizeEvent
 
 /**
     @class wxSizeEvent
 

-    A size event holds information about size change events.
+    A size event holds information about size change events of wxWindow.

 
     The EVT_SIZE handler function will be called when the window has been resized.
 
 
     The EVT_SIZE handler function will be called when the window has been resized.
 


@@ -3387,7 +3528,7 @@ public:
 
     @beginEventTable{wxSizeEvent}
     @event{EVT_SIZE(func)}
 
     @beginEventTable{wxSizeEvent}
     @event{EVT_SIZE(func)}

-        Process a wxEVT_SIZE event.
+        Process a @c wxEVT_SIZE event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -3414,8 +3555,8 @@ public:
 /**
     @class wxSetCursorEvent
 
 /**
     @class wxSetCursorEvent
 

-    A wxSetCursorEvent is generated when the mouse cursor is about to be set as a
-    result of mouse motion.
+    A wxSetCursorEvent is generated from wxWindow when the mouse cursor is about
+    to be set as a result of mouse motion.

 
     This event gives the application the chance to perform specific mouse cursor
     processing based on the current position of the mouse within the window.
 
     This event gives the application the chance to perform specific mouse cursor
     processing based on the current position of the mouse within the window.


@@ -3423,7 +3564,7 @@ public:
 
     @beginEventTable{wxSetCursorEvent}
     @event{EVT_SET_CURSOR(func)}
 
     @beginEventTable{wxSetCursorEvent}
     @event{EVT_SET_CURSOR(func)}

-        Process a wxEVT_SET_CURSOR event.
+        Process a @c wxEVT_SET_CURSOR event.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -3497,14 +3638,132 @@ wxEventType wxEVT_NULL;
 
 /**
     Initializes a new event type using wxNewEventType().
 
 /**
     Initializes a new event type using wxNewEventType().

+
+    @deprecated Use wxDEFINE_EVENT() instead

 */
 #define DEFINE_EVENT_TYPE(name)     const wxEventType name = wxNewEventType();
 
 /**
     Generates a new unique event type.
 */
 #define DEFINE_EVENT_TYPE(name)     const wxEventType name = wxNewEventType();
 
 /**
     Generates a new unique event type.

+
+    Usually this function is only used by wxDEFINE_EVENT() and not called
+    directly.

 */
 wxEventType wxNewEventType();
 
 */
 wxEventType wxNewEventType();
 

+/**
+    Define a new event type associated with the specified event class.
+
+    This macro defines a new unique event type @a name associated with the
+    event class @a cls.
+
+    For example:
+    @code
+    wxDEFINE_EVENT(MY_COMMAND_EVENT, wxCommandEvent);
+
+    class MyCustomEvent : public wxEvent { ... };
+    wxDEFINE_EVENT(MY_CUSTOM_EVENT, MyCustomEvent);
+    @endcode
+
+    @see wxDECLARE_EVENT(), @ref overview_events_custom
+ */
+#define wxDEFINE_EVENT(name, cls) \
+    const wxEventTypeTag< cls > name(wxNewEventType())
+
+/**
+    Declares a custom event type.
+
+    This macro declares a variable called @a name which must be defined
+    elsewhere using wxDEFINE_EVENT().
+
+    The class @a cls must be the wxEvent-derived class associated with the
+    events of this type and its full declaration must be visible from the point
+    of use of this macro.
+ */
+#define wxDECLARE_EVENT(name, cls) \
+        wxDECLARE_EXPORTED_EVENT(wxEMPTY_PARAMETER_VALUE, name, cls)
+
+/**
+    Variant of wxDECLARE_EVENT() used for event types defined inside a shared
+    library.
+
+    This is mostly used by wxWidgets internally, e.g.
+    @code
+    wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent)
+    @endcode
+ */
+#define wxDECLARE_EXPORTED_EVENT( expdecl, name, cls ) \
+    extern const expdecl wxEventTypeTag< cls > name;
+
+/**
+    Helper macro for definition of custom event table macros.
+
+    This macro must only be used if wxEVENTS_COMPATIBILITY_2_8 is 1, otherwise
+    it is better and more clear to just use the address of the function
+    directly as this is all this macro does in this case. However it needs to
+    explicitly cast @a func to @a functype, which is the type of wxEvtHandler
+    member function taking the custom event argument when
+    wxEVENTS_COMPATIBILITY_2_8 is 0.
+
+    See wx__DECLARE_EVT0 for an example of use.
+
+    @see @ref overview_events_custom_ownclass
+ */
+#define wxEVENT_HANDLER_CAST(functype, func) (&func)
+
+/**
+    This macro is used to define event table macros for handling custom
+    events.
+
+    Example of use:
+    @code
+    class MyEvent : public wxEvent { ... };
+
+    // note that this is not necessary unless using old compilers: for the
+    // reasonably new ones just use &func instead of MyEventHandler(func)
+    typedef void (wxEvtHandler::*MyEventFunction)(MyEvent&);
+    #define MyEventHandler(func) wxEVENT_HANDLER_CAST(MyEventFunction, func)
+
+    wxDEFINE_EVENT(MY_EVENT_TYPE, MyEvent);
+
+    #define EVT_MY(id, func) \
+        wx__DECLARE_EVT1(MY_EVENT_TYPE, id, MyEventHandler(func))
+
+    ...
+
+    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+        EVT_MY(wxID_ANY, MyFrame::OnMyEvent)
+    END_EVENT_TABLE()
+    @endcode
+
+    @param evt
+        The event type to handle.
+    @param id
+        The identifier of events to handle.
+    @param fn
+        The event handler method.
+ */
+#define wx__DECLARE_EVT1(evt, id, fn) \
+    wx__DECLARE_EVT2(evt, id, wxID_ANY, fn)
+
+/**
+    Generalized version of the wx__DECLARE_EVT1() macro taking a range of
+    IDs instead of a single one.
+    Argument @a id1 is the first identifier of the range, @a id2 is the
+    second identifier of the range.
+*/
+#define wx__DECLARE_EVT2(evt, id1, id2, fn) \
+    DECLARE_EVENT_TABLE_ENTRY(evt, id1, id2, fn, NULL),
+
+/**
+    Simplified version of the wx__DECLARE_EVT1() macro, to be used when the
+    event type must be handled regardless of the ID associated with the
+    specific event instances.
+*/
+#define wx__DECLARE_EVT0(evt, fn) \
+    wx__DECLARE_EVT1(evt, wxID_ANY, fn)
+
+

 /**
     Use this macro inside a class declaration to declare a @e static event table
     for that class.
 /**
     Use this macro inside a class declaration to declare a @e static event table
     for that class.