]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/event.cpp
dynamic event types actually work with these changes, also corrected more
[wxWidgets.git] / src / common / event.cpp
index b0de8f2df37f82630082eccec381e9fb26befa34..89a55d9a7eda7626bdd94b5ae49311c8d3a936a7 100644 (file)
@@ -6,9 +6,17 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
     #pragma implementation "event.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
-    #include "wx/control.h"
-    #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/dc.h"
+    #include "wx/list.h"
+
+    #if wxUSE_GUI
+        #include "wx/control.h"
+        #include "wx/utils.h"
+        #include "wx/dc.h"
+    #endif // wxUSE_GUI
 #endif
 
 #include "wx/event.h"
-#include "wx/validate.h"
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
-    IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+#if wxUSE_GUI
+    #include "wx/validate.h"
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+wxEventType wxEVT_NULL = 0;
+wxEventType wxEVT_FIRST = 10000;
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
+
+#if wxUSE_GUI
     IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
+#endif // wxUSE_GUI
+
+const wxEventTable *wxEvtHandler::GetEventTable() const
+    { return &wxEvtHandler::sm_eventTable; }
 
-    const wxEventTable *wxEvtHandler::GetEventTable() const
-        { return &wxEvtHandler::sm_eventTable; }
+const wxEventTable wxEvtHandler::sm_eventTable =
+    { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
 
-    const wxEventTable wxEvtHandler::sm_eventTable =
-        { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
+const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
+    { wxEventTableEntry(0, 0, 0, (wxObjectEventFunction)NULL, NULL) };
 
-    const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
-        { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } };
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
 
-#endif // !USE_SHARED_LIBRARY
+// To put pending event handlers
+wxList *wxPendingEvents = (wxList *)NULL;
 
 #if wxUSE_THREADS
-/* To put pending event handlers */
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
+    // protects wxPendingEvents list
+    wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL;
 #endif
 
+wxEventType wxEVT_COMMAND_BUTTON_CLICKED;
+wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED;
+wxEventType wxEVT_COMMAND_CHOICE_SELECTED;
+wxEventType wxEVT_COMMAND_LISTBOX_SELECTED;
+wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED;
+wxEventType wxEVT_COMMAND_TEXT_UPDATED;
+wxEventType wxEVT_COMMAND_TEXT_ENTER;
+wxEventType wxEVT_COMMAND_MENU_SELECTED;
+wxEventType wxEVT_COMMAND_TOOL_CLICKED;
+wxEventType wxEVT_COMMAND_SLIDER_UPDATED;
+wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED;
+wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED;
+wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED;
+wxEventType wxEVT_COMMAND_VLBOX_SELECTED;
+wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED;
+wxEventType wxEVT_COMMAND_TOOL_RCLICKED;
+wxEventType wxEVT_COMMAND_TOOL_ENTER;
+wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED;
+
+// Sockets and timers send events, too
+wxEventType wxEVT_SOCKET;
+wxEventType wxEVT_TIMER;
+
+// Mouse event types
+wxEventType wxEVT_LEFT_DOWN;
+wxEventType wxEVT_LEFT_UP;
+wxEventType wxEVT_MIDDLE_DOWN;
+wxEventType wxEVT_MIDDLE_UP;
+wxEventType wxEVT_RIGHT_DOWN;
+wxEventType wxEVT_RIGHT_UP;
+wxEventType wxEVT_MOTION;
+wxEventType wxEVT_ENTER_WINDOW;
+wxEventType wxEVT_LEAVE_WINDOW;
+wxEventType wxEVT_LEFT_DCLICK;
+wxEventType wxEVT_MIDDLE_DCLICK;
+wxEventType wxEVT_RIGHT_DCLICK;
+wxEventType wxEVT_SET_FOCUS;
+wxEventType wxEVT_KILL_FOCUS;
+
+// Non-client mouse events
+wxEventType wxEVT_NC_LEFT_DOWN;
+wxEventType wxEVT_NC_LEFT_UP;
+wxEventType wxEVT_NC_MIDDLE_DOWN;
+wxEventType wxEVT_NC_MIDDLE_UP;
+wxEventType wxEVT_NC_RIGHT_DOWN;
+wxEventType wxEVT_NC_RIGHT_UP;
+wxEventType wxEVT_NC_MOTION;
+wxEventType wxEVT_NC_ENTER_WINDOW;
+wxEventType wxEVT_NC_LEAVE_WINDOW;
+wxEventType wxEVT_NC_LEFT_DCLICK;
+wxEventType wxEVT_NC_MIDDLE_DCLICK;
+wxEventType wxEVT_NC_RIGHT_DCLICK;
+
+// Character input event type
+wxEventType wxEVT_CHAR;
+wxEventType wxEVT_CHAR_HOOK;
+wxEventType wxEVT_NAVIGATION_KEY;
+wxEventType wxEVT_KEY_DOWN;
+wxEventType wxEVT_KEY_UP;
+
+// Set cursor event
+wxEventType wxEVT_SET_CURSOR;
+
+// wxScrollbar and wxSlider event identifiers
+wxEventType wxEVT_SCROLL_TOP;
+wxEventType wxEVT_SCROLL_BOTTOM;
+wxEventType wxEVT_SCROLL_LINEUP;
+wxEventType wxEVT_SCROLL_LINEDOWN;
+wxEventType wxEVT_SCROLL_PAGEUP;
+wxEventType wxEVT_SCROLL_PAGEDOWN;
+wxEventType wxEVT_SCROLL_THUMBTRACK;
+wxEventType wxEVT_SCROLL_THUMBRELEASE;
+
+// Scroll events from wxWindow
+wxEventType wxEVT_SCROLLWIN_TOP;
+wxEventType wxEVT_SCROLLWIN_BOTTOM;
+wxEventType wxEVT_SCROLLWIN_LINEUP;
+wxEventType wxEVT_SCROLLWIN_LINEDOWN;
+wxEventType wxEVT_SCROLLWIN_PAGEUP;
+wxEventType wxEVT_SCROLLWIN_PAGEDOWN;
+wxEventType wxEVT_SCROLLWIN_THUMBTRACK;
+wxEventType wxEVT_SCROLLWIN_THUMBRELEASE;
+
+// System events
+wxEventType wxEVT_SIZE;
+wxEventType wxEVT_MOVE;
+wxEventType wxEVT_CLOSE_WINDOW;
+wxEventType wxEVT_END_SESSION;
+wxEventType wxEVT_QUERY_END_SESSION;
+wxEventType wxEVT_ACTIVATE_APP;
+wxEventType wxEVT_POWER;
+wxEventType wxEVT_ACTIVATE;
+wxEventType wxEVT_CREATE;
+wxEventType wxEVT_DESTROY;
+wxEventType wxEVT_SHOW;
+wxEventType wxEVT_ICONIZE;
+wxEventType wxEVT_MAXIMIZE;
+wxEventType wxEVT_MOUSE_CAPTURE_CHANGED;
+wxEventType wxEVT_PAINT;
+wxEventType wxEVT_ERASE_BACKGROUND;
+wxEventType wxEVT_NC_PAINT;
+wxEventType wxEVT_PAINT_ICON;
+wxEventType wxEVT_MENU_CHAR;
+wxEventType wxEVT_MENU_INIT;
+wxEventType wxEVT_MENU_HIGHLIGHT;
+wxEventType wxEVT_POPUP_MENU_INIT;
+wxEventType wxEVT_CONTEXT_MENU;
+wxEventType wxEVT_SYS_COLOUR_CHANGED;
+wxEventType wxEVT_SETTING_CHANGED;
+wxEventType wxEVT_QUERY_NEW_PALETTE;
+wxEventType wxEVT_PALETTE_CHANGED;
+wxEventType wxEVT_JOY_BUTTON_DOWN;
+wxEventType wxEVT_JOY_BUTTON_UP;
+wxEventType wxEVT_JOY_MOVE;
+wxEventType wxEVT_JOY_ZMOVE;
+wxEventType wxEVT_DROP_FILES;
+wxEventType wxEVT_DRAW_ITEM;
+wxEventType wxEVT_MEASURE_ITEM;
+wxEventType wxEVT_COMPARE_ITEM;
+wxEventType wxEVT_INIT_DIALOG;
+wxEventType wxEVT_IDLE;
+wxEventType wxEVT_UPDATE_UI;
+
+// System misc.
+wxEventType wxEVT_END_PROCESS;
+
+// Dial up events
+wxEventType wxEVT_DIALUP_CONNECTED;
+wxEventType wxEVT_DIALUP_DISCONNECTED;
+
+// Generic command events
+// Note: a click is a higher-level event than button down/up
+wxEventType wxEVT_COMMAND_LEFT_CLICK;
+wxEventType wxEVT_COMMAND_LEFT_DCLICK;
+wxEventType wxEVT_COMMAND_RIGHT_CLICK;
+wxEventType wxEVT_COMMAND_RIGHT_DCLICK;
+wxEventType wxEVT_COMMAND_SET_FOCUS;
+wxEventType wxEVT_COMMAND_KILL_FOCUS;
+wxEventType wxEVT_COMMAND_ENTER;
+
+// Tree control event types
+wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG;
+wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
+wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT;
+wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM;
+wxEventType wxEVT_COMMAND_TREE_GET_INFO;
+wxEventType wxEVT_COMMAND_TREE_SET_INFO;
+wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED;
+wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING;
+wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
+wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
+wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED;
+wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING;
+wxEventType wxEVT_COMMAND_TREE_KEY_DOWN;
+wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED;
+wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK;
+wxEventType wxEVT_COMMAND_TREE_END_DRAG;
+
+// List control event types
+wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG;
+wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
+wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT;
+wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM;
+wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
+wxEventType wxEVT_COMMAND_LIST_GET_INFO;
+wxEventType wxEVT_COMMAND_LIST_SET_INFO;
+wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED;
+wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED;
+wxEventType wxEVT_COMMAND_LIST_KEY_DOWN;
+wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM;
+wxEventType wxEVT_COMMAND_LIST_COL_CLICK;
+wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
+wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK;
+wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+
+// Tab and notebook control event types
+wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED;
+wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING;
+wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED;
+wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING;
+
+// Splitter events
+wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED;
+wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING;
+wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED;
+wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT;
+
+// Wizard events
+wxEventType wxEVT_WIZARD_PAGE_CHANGED;
+wxEventType wxEVT_WIZARD_PAGE_CHANGING;
+wxEventType wxEVT_WIZARD_CANCEL;
+
+// Calendar events
+wxEventType wxEVT_CALENDAR_SEL_CHANGED;
+wxEventType wxEVT_CALENDAR_DAY_CHANGED;
+wxEventType wxEVT_CALENDAR_MONTH_CHANGED;
+wxEventType wxEVT_CALENDAR_YEAR_CHANGED;
+wxEventType wxEVT_CALENDAR_DOUBLECLICKED;
+wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED;
+
+// Help events
+wxEventType wxEVT_HELP;
+wxEventType wxEVT_DETAILED_HELP;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// event initialization
+// ----------------------------------------------------------------------------
+
+int wxNewEventType()
+{
+    // MT-FIXME
+    static int s_lastUsedEventType = wxEVT_FIRST;
+
+    return s_lastUsedEventType++;
+}
+
+static void InitEvents()
+{
+#ifdef __WXDEBUG__
+    // this function is supposed to be called only once, as normally this
+    // should be always true we only do this check in debug mode
+    static bool s_inInitEvents = FALSE;
+    wxCHECK_RET( !s_inInitEvents, _T("InitEvents() reentrancy!") );
+
+    // note that we don't reset it to FALSE any more as we shouldn't be called
+    // again
+    s_inInitEvents = TRUE;
+#endif // __WXDEBUG__
+
+    wxEVT_COMMAND_BUTTON_CLICKED = wxNewEventType();
+    wxEVT_COMMAND_CHECKBOX_CLICKED = wxNewEventType();
+    wxEVT_COMMAND_CHOICE_SELECTED = wxNewEventType();
+    wxEVT_COMMAND_LISTBOX_SELECTED = wxNewEventType();
+    wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxNewEventType();
+    wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxNewEventType();
+    wxEVT_COMMAND_TEXT_UPDATED = wxNewEventType();
+    wxEVT_COMMAND_TEXT_ENTER = wxNewEventType();
+    wxEVT_COMMAND_MENU_SELECTED = wxNewEventType();
+    wxEVT_COMMAND_TOOL_CLICKED = wxNewEventType();
+    wxEVT_COMMAND_SLIDER_UPDATED = wxNewEventType();
+    wxEVT_COMMAND_RADIOBOX_SELECTED = wxNewEventType();
+    wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxNewEventType();
+    wxEVT_COMMAND_SCROLLBAR_UPDATED = wxNewEventType();
+    wxEVT_COMMAND_VLBOX_SELECTED = wxNewEventType();
+    wxEVT_COMMAND_COMBOBOX_SELECTED = wxNewEventType();
+    wxEVT_COMMAND_TOOL_RCLICKED = wxNewEventType();
+    wxEVT_COMMAND_TOOL_ENTER = wxNewEventType();
+    wxEVT_COMMAND_SPINCTRL_UPDATED = wxNewEventType();
+
+    // Sockets and timers send events, too
+    wxEVT_SOCKET = wxNewEventType();
+    wxEVT_TIMER = wxNewEventType();
+
+    // Mouse event types
+    wxEVT_LEFT_DOWN = wxNewEventType();
+    wxEVT_LEFT_UP = wxNewEventType();
+    wxEVT_MIDDLE_DOWN = wxNewEventType();
+    wxEVT_MIDDLE_UP = wxNewEventType();
+    wxEVT_RIGHT_DOWN = wxNewEventType();
+    wxEVT_RIGHT_UP = wxNewEventType();
+    wxEVT_MOTION = wxNewEventType();
+    wxEVT_ENTER_WINDOW = wxNewEventType();
+    wxEVT_LEAVE_WINDOW = wxNewEventType();
+    wxEVT_LEFT_DCLICK = wxNewEventType();
+    wxEVT_MIDDLE_DCLICK = wxNewEventType();
+    wxEVT_RIGHT_DCLICK = wxNewEventType();
+    wxEVT_SET_FOCUS = wxNewEventType();
+    wxEVT_KILL_FOCUS = wxNewEventType();
+
+    // Non-client mouse events
+    wxEVT_NC_LEFT_DOWN = wxNewEventType();
+    wxEVT_NC_LEFT_UP = wxNewEventType();
+    wxEVT_NC_MIDDLE_DOWN = wxNewEventType();
+    wxEVT_NC_MIDDLE_UP = wxNewEventType();
+    wxEVT_NC_RIGHT_DOWN = wxNewEventType();
+    wxEVT_NC_RIGHT_UP = wxNewEventType();
+    wxEVT_NC_MOTION = wxNewEventType();
+    wxEVT_NC_ENTER_WINDOW = wxNewEventType();
+    wxEVT_NC_LEAVE_WINDOW = wxNewEventType();
+    wxEVT_NC_LEFT_DCLICK = wxNewEventType();
+    wxEVT_NC_MIDDLE_DCLICK = wxNewEventType();
+    wxEVT_NC_RIGHT_DCLICK = wxNewEventType();
+
+    // Character input event type
+    wxEVT_CHAR = wxNewEventType();
+    wxEVT_CHAR_HOOK = wxNewEventType();
+    wxEVT_NAVIGATION_KEY = wxNewEventType();
+    wxEVT_KEY_DOWN = wxNewEventType();
+    wxEVT_KEY_UP = wxNewEventType();
+
+    // Set cursor event
+    wxEVT_SET_CURSOR = wxNewEventType();
+
+    // wxScrollbar and wxSlider event identifiers
+    wxEVT_SCROLL_TOP = wxNewEventType();
+    wxEVT_SCROLL_BOTTOM = wxNewEventType();
+    wxEVT_SCROLL_LINEUP = wxNewEventType();
+    wxEVT_SCROLL_LINEDOWN = wxNewEventType();
+    wxEVT_SCROLL_PAGEUP = wxNewEventType();
+    wxEVT_SCROLL_PAGEDOWN = wxNewEventType();
+    wxEVT_SCROLL_THUMBTRACK = wxNewEventType();
+    wxEVT_SCROLL_THUMBRELEASE = wxNewEventType();
+
+    // Scroll events from wxWindow
+    wxEVT_SCROLLWIN_TOP = wxNewEventType();
+    wxEVT_SCROLLWIN_BOTTOM = wxNewEventType();
+    wxEVT_SCROLLWIN_LINEUP = wxNewEventType();
+    wxEVT_SCROLLWIN_LINEDOWN = wxNewEventType();
+    wxEVT_SCROLLWIN_PAGEUP = wxNewEventType();
+    wxEVT_SCROLLWIN_PAGEDOWN = wxNewEventType();
+    wxEVT_SCROLLWIN_THUMBTRACK = wxNewEventType();
+    wxEVT_SCROLLWIN_THUMBRELEASE = wxNewEventType();
+
+    // System events
+    wxEVT_SIZE = wxNewEventType();
+    wxEVT_MOVE = wxNewEventType();
+    wxEVT_CLOSE_WINDOW = wxNewEventType();
+    wxEVT_END_SESSION = wxNewEventType();
+    wxEVT_QUERY_END_SESSION = wxNewEventType();
+    wxEVT_ACTIVATE_APP = wxNewEventType();
+    wxEVT_POWER = wxNewEventType();
+    wxEVT_ACTIVATE = wxNewEventType();
+    wxEVT_CREATE = wxNewEventType();
+    wxEVT_DESTROY = wxNewEventType();
+    wxEVT_SHOW = wxNewEventType();
+    wxEVT_ICONIZE = wxNewEventType();
+    wxEVT_MAXIMIZE = wxNewEventType();
+    wxEVT_MOUSE_CAPTURE_CHANGED = wxNewEventType();
+    wxEVT_PAINT = wxNewEventType();
+    wxEVT_ERASE_BACKGROUND = wxNewEventType();
+    wxEVT_NC_PAINT = wxNewEventType();
+    wxEVT_PAINT_ICON = wxNewEventType();
+    wxEVT_MENU_CHAR = wxNewEventType();
+    wxEVT_MENU_INIT = wxNewEventType();
+    wxEVT_MENU_HIGHLIGHT = wxNewEventType();
+    wxEVT_POPUP_MENU_INIT = wxNewEventType();
+    wxEVT_CONTEXT_MENU = wxNewEventType();
+    wxEVT_SYS_COLOUR_CHANGED = wxNewEventType();
+    wxEVT_SETTING_CHANGED = wxNewEventType();
+    wxEVT_QUERY_NEW_PALETTE = wxNewEventType();
+    wxEVT_PALETTE_CHANGED = wxNewEventType();
+    wxEVT_JOY_BUTTON_DOWN = wxNewEventType();
+    wxEVT_JOY_BUTTON_UP = wxNewEventType();
+    wxEVT_JOY_MOVE = wxNewEventType();
+    wxEVT_JOY_ZMOVE = wxNewEventType();
+    wxEVT_DROP_FILES = wxNewEventType();
+    wxEVT_DRAW_ITEM = wxNewEventType();
+    wxEVT_MEASURE_ITEM = wxNewEventType();
+    wxEVT_COMPARE_ITEM = wxNewEventType();
+    wxEVT_INIT_DIALOG = wxNewEventType();
+    wxEVT_IDLE = wxNewEventType();
+    wxEVT_UPDATE_UI = wxNewEventType();
+
+    // System misc.
+    wxEVT_END_PROCESS = wxNewEventType();
+
+    // Dial up events
+    wxEVT_DIALUP_CONNECTED = wxNewEventType();
+    wxEVT_DIALUP_DISCONNECTED = wxNewEventType();
+
+    // Generic command events
+    // Note: a click is a higher-level event than button down/up
+    wxEVT_COMMAND_LEFT_CLICK = wxNewEventType();
+    wxEVT_COMMAND_LEFT_DCLICK = wxNewEventType();
+    wxEVT_COMMAND_RIGHT_CLICK = wxNewEventType();
+    wxEVT_COMMAND_RIGHT_DCLICK = wxNewEventType();
+    wxEVT_COMMAND_SET_FOCUS = wxNewEventType();
+    wxEVT_COMMAND_KILL_FOCUS = wxNewEventType();
+    wxEVT_COMMAND_ENTER = wxNewEventType();
+
+    // Tree control event types
+    wxEVT_COMMAND_TREE_BEGIN_DRAG = wxNewEventType();
+    wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxNewEventType();
+    wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxNewEventType();
+    wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxNewEventType();
+    wxEVT_COMMAND_TREE_DELETE_ITEM = wxNewEventType();
+    wxEVT_COMMAND_TREE_GET_INFO = wxNewEventType();
+    wxEVT_COMMAND_TREE_SET_INFO = wxNewEventType();
+    wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxNewEventType();
+    wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxNewEventType();
+    wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxNewEventType();
+    wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxNewEventType();
+    wxEVT_COMMAND_TREE_SEL_CHANGED = wxNewEventType();
+    wxEVT_COMMAND_TREE_SEL_CHANGING = wxNewEventType();
+    wxEVT_COMMAND_TREE_KEY_DOWN = wxNewEventType();
+    wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxNewEventType();
+    wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxNewEventType();
+    wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxNewEventType();
+    wxEVT_COMMAND_TREE_END_DRAG = wxNewEventType();
+
+    // List control event types
+    wxEVT_COMMAND_LIST_BEGIN_DRAG = wxNewEventType();
+    wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxNewEventType();
+    wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxNewEventType();
+    wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxNewEventType();
+    wxEVT_COMMAND_LIST_DELETE_ITEM = wxNewEventType();
+    wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxNewEventType();
+    wxEVT_COMMAND_LIST_GET_INFO = wxNewEventType();
+    wxEVT_COMMAND_LIST_SET_INFO = wxNewEventType();
+    wxEVT_COMMAND_LIST_ITEM_SELECTED = wxNewEventType();
+    wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxNewEventType();
+    wxEVT_COMMAND_LIST_KEY_DOWN = wxNewEventType();
+    wxEVT_COMMAND_LIST_INSERT_ITEM = wxNewEventType();
+    wxEVT_COMMAND_LIST_COL_CLICK = wxNewEventType();
+    wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxNewEventType();
+    wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxNewEventType();
+    wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxNewEventType();
+
+    // Tab and notebook control event types
+    wxEVT_COMMAND_TAB_SEL_CHANGED = wxNewEventType();
+    wxEVT_COMMAND_TAB_SEL_CHANGING = wxNewEventType();
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxNewEventType();
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxNewEventType();
+
+    // Splitter events
+    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxNewEventType();
+    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxNewEventType();
+    wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxNewEventType();
+    wxEVT_COMMAND_SPLITTER_UNSPLIT = wxNewEventType();
+
+    // Wizard events
+    wxEVT_WIZARD_PAGE_CHANGED = wxNewEventType();
+    wxEVT_WIZARD_PAGE_CHANGING = wxNewEventType();
+    wxEVT_WIZARD_CANCEL = wxNewEventType();
+
+    // Calendar events
+    wxEVT_CALENDAR_SEL_CHANGED = wxNewEventType();
+    wxEVT_CALENDAR_DAY_CHANGED = wxNewEventType();
+    wxEVT_CALENDAR_MONTH_CHANGED = wxNewEventType();
+    wxEVT_CALENDAR_YEAR_CHANGED = wxNewEventType();
+    wxEVT_CALENDAR_DOUBLECLICKED = wxNewEventType();
+    wxEVT_CALENDAR_WEEKDAY_CLICKED = wxNewEventType();
+
+    // Help events
+    wxEVT_HELP = wxNewEventType();
+    wxEVT_DETAILED_HELP = wxNewEventType();
+}
+
+// ----------------------------------------------------------------------------
+// wxEventTableEntry
+// ----------------------------------------------------------------------------
+
+wxEventTableEntry::wxEventTableEntry(int evType, int id, int idLast,
+                                     wxObjectEventFunction fn, wxObject *data)
+{
+    static bool s_initEventsDone = FALSE;
+    if ( !s_initEventsDone )
+    {
+        InitEvents();
+
+        s_initEventsDone = TRUE;
+    }
+
+    m_eventType = evType;
+    m_id = id;
+    m_lastId = idLast;
+    m_fn = fn;
+    m_callbackUserData = data;
+}
+
+// ----------------------------------------------------------------------------
+// wxEvent
+// ----------------------------------------------------------------------------
+
 /*
  * General wxWindows events, covering
  * all interesting things that might happen (button clicking, resizing,
@@ -90,7 +598,6 @@ wxEvent::wxEvent(int theId)
 {
     m_eventType = wxEVT_NULL;
     m_eventObject = (wxObject *) NULL;
-    m_eventHandle = (char *) NULL;
     m_timeStamp = 0;
     m_id = theId;
     m_skipped = FALSE;
@@ -98,22 +605,22 @@ wxEvent::wxEvent(int theId)
     m_isCommandEvent = FALSE;
 }
 
-wxObject *wxEvent::Clone() const
+void wxEvent::CopyObject(wxObject& object_dest) const
 {
-    wxEvent *event = (wxEvent *)wxObject::Clone();
-
-    event->m_eventType = m_eventType;
-    event->m_eventObject = m_eventObject;
-    event->m_eventHandle = m_eventHandle;
-    event->m_timeStamp = m_timeStamp;
-    event->m_id = m_id;
-    event->m_skipped = m_skipped;
-    event->m_callbackUserData = m_callbackUserData;
-    event->m_isCommandEvent = m_isCommandEvent;
-
-    return event;
+    wxEvent *obj = (wxEvent *)&object_dest;
+    wxObject::CopyObject(object_dest);
+
+    obj->m_eventType = m_eventType;
+    obj->m_eventObject = m_eventObject;
+    obj->m_timeStamp = m_timeStamp;
+    obj->m_id = m_id;
+    obj->m_skipped = m_skipped;
+    obj->m_callbackUserData = m_callbackUserData;
+    obj->m_isCommandEvent = m_isCommandEvent;
 }
 
+#if wxUSE_GUI
+
 /*
  * Command events
  *
@@ -127,10 +634,36 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
     m_extraLong = 0;
     m_commandInt = 0;
     m_id = theId;
-    m_commandString = (wxChar *) NULL;
+    m_commandString = wxEmptyString;
     m_isCommandEvent = TRUE;
 }
 
+void wxCommandEvent::CopyObject(wxObject& obj_d) const
+{
+    wxCommandEvent *obj = (wxCommandEvent *)&obj_d;
+
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_clientData    = m_clientData;
+    obj->m_clientObject  = m_clientObject;
+    obj->m_extraLong     = m_extraLong;
+    obj->m_commandInt    = m_commandInt;
+    obj->m_commandString = m_commandString;
+}
+
+/*
+ * Notify events
+ */
+
+void wxNotifyEvent::CopyObject(wxObject& obj_d) const
+{
+    wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d;
+
+    wxEvent::CopyObject(obj_d);
+
+    if (!m_bAllow) obj->Veto();
+}
+
 /*
  * Scroll events
  */
@@ -145,6 +678,28 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
     m_commandInt = pos;
 }
 
+/*
+ * ScrollWin events
+ */
+
+wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
+                                   int pos,
+                                   int orient)
+{
+    m_eventType = commandType;
+    m_extraLong = orient;
+    m_commandInt = pos;
+}
+
+void wxScrollWinEvent::CopyObject(wxObject& obj_d) const
+{
+    wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d;
+
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_extraLong    = m_extraLong;
+    obj->m_commandInt   = m_commandInt;
+}
 
 /*
  * Mouse events
@@ -165,6 +720,23 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
     m_y = 0;
 }
 
+void wxMouseEvent::CopyObject(wxObject& obj_d) const
+{
+    wxMouseEvent *obj = (wxMouseEvent *)&obj_d;
+
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_metaDown = m_metaDown;
+    obj->m_altDown = m_altDown;
+    obj->m_controlDown = m_controlDown;
+    obj->m_shiftDown = m_shiftDown;
+    obj->m_leftDown = m_leftDown;
+    obj->m_rightDown = m_rightDown;
+    obj->m_middleDown = m_middleDown;
+    obj->m_x = m_x;
+    obj->m_y = m_y;
+}
+
 // True if was a button dclick event (1 = left, 2 = middle, 3 = right)
 // or any button dclick event (but = -1)
 bool wxMouseEvent::ButtonDClick(int but) const
@@ -180,7 +752,7 @@ bool wxMouseEvent::ButtonDClick(int but) const
         case 3:
             return RightDClick();
         default:
-            wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonDClick"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick"));
     }
 
     return FALSE;
@@ -201,7 +773,7 @@ bool wxMouseEvent::ButtonDown(int but) const
         case 3:
             return RightDown();
         default:
-            wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonDown"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown"));
     }
 
     return FALSE;
@@ -221,7 +793,7 @@ bool wxMouseEvent::ButtonUp(int but) const
         case 3:
             return RightUp();
         default:
-            wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonUp"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp"));
     }
 
     return FALSE;
@@ -232,7 +804,7 @@ bool wxMouseEvent::Button(int but) const
 {
     switch (but) {
         case -1:
-            return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)) ;
+            return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1));
         case 1:
             return (LeftDown() || LeftUp() || LeftDClick());
         case 2:
@@ -240,7 +812,7 @@ bool wxMouseEvent::Button(int but) const
         case 3:
             return (RightDown() || RightUp() || RightDClick());
         default:
-            wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::Button"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button"));
     }
 
     return FALSE;
@@ -258,7 +830,7 @@ bool wxMouseEvent::ButtonIsDown(int but) const
         case 3:
             return RightIsDown();
         default:
-            wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonIsDown"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown"));
     }
 
     return FALSE;
@@ -285,6 +857,163 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
     m_metaDown = FALSE;
     m_altDown = FALSE;
     m_keyCode = 0;
+    m_scanCode = 0;
+}
+
+void wxKeyEvent::CopyObject(wxObject& obj_d) const
+{
+    wxKeyEvent *obj = (wxKeyEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_x = m_x;
+    obj->m_y = m_y;
+    obj->m_keyCode = m_keyCode;
+    
+    obj->m_shiftDown   = m_shiftDown;
+    obj->m_controlDown = m_controlDown;
+    obj->m_metaDown    = m_metaDown;
+    obj->m_altDown     = m_altDown;
+    obj->m_keyCode     = m_keyCode;
+}
+
+
+/*
+ * Misc events
+ */
+
+void wxSizeEvent::CopyObject(wxObject& obj_d) const
+{
+    wxSizeEvent *obj = (wxSizeEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_size = m_size;
+}
+
+void wxMoveEvent::CopyObject(wxObject& obj_d) const
+{
+    wxMoveEvent *obj = (wxMoveEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_pos = m_pos;
+}
+
+void wxEraseEvent::CopyObject(wxObject& obj_d) const
+{
+    wxEraseEvent *obj = (wxEraseEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_dc = m_dc;
+}
+
+void wxActivateEvent::CopyObject(wxObject& obj_d) const
+{
+    wxActivateEvent *obj = (wxActivateEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_active = m_active;
+}
+
+void wxMenuEvent::CopyObject(wxObject& obj_d) const
+{
+    wxMenuEvent *obj = (wxMenuEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_menuId = m_menuId;
+}
+
+void wxCloseEvent::CopyObject(wxObject& obj_d) const
+{
+    wxCloseEvent *obj = (wxCloseEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_loggingOff = m_loggingOff;
+    obj->m_veto = m_veto;
+#if WXWIN_COMPATIBILITY
+    obj->m_force = m_force;
+#endif
+    obj->m_canVeto = m_canVeto;
+}
+
+void wxShowEvent::CopyObject(wxObject& obj_d) const
+{
+    wxShowEvent *obj = (wxShowEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_show = m_show;
+}
+
+void wxJoystickEvent::CopyObject(wxObject& obj_d) const
+{
+    wxJoystickEvent *obj = (wxJoystickEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_pos = m_pos;
+    obj->m_zPosition = m_zPosition;
+    obj->m_buttonChange = m_buttonChange;
+    obj->m_buttonState = m_buttonState;
+    obj->m_joyStick = m_joyStick;
+}
+
+void wxDropFilesEvent::CopyObject(wxObject& obj_d) const
+{
+    wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_noFiles = m_noFiles;
+    obj->m_pos = m_pos;
+    // TODO: Problem with obj->m_files. It should be deallocated by the
+    // destructor of the event.
+}
+
+void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const
+{
+    wxUpdateUIEvent *obj = (wxUpdateUIEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_checked = m_checked;
+    obj->m_enabled = m_enabled;
+    obj->m_text = m_text;
+    obj->m_setText = m_setText;
+    obj->m_setChecked = m_setChecked;
+    obj->m_setEnabled = m_setEnabled;
+}
+
+void wxPaletteChangedEvent::CopyObject(wxObject &obj_d) const
+{
+    wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_changedWindow = m_changedWindow;
+}
+
+void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const
+{
+    wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_paletteRealized = m_paletteRealized;
+}
+
+wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
+{
+    SetEventType(wxEVT_CREATE);
+    SetEventObject(win);
+}
+
+wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
+{
+    SetEventType(wxEVT_DESTROY);
+    SetEventObject(win);
+}
+
+#endif // wxUSE_GUI
+
+void wxIdleEvent::CopyObject(wxObject& obj_d) const
+{
+    wxIdleEvent *obj = (wxIdleEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_requestMore = m_requestMore;
 }
 
 /*
@@ -298,10 +1027,12 @@ wxEvtHandler::wxEvtHandler()
     m_enabled = TRUE;
     m_dynamicEvents = (wxList *) NULL;
     m_isWindow = FALSE;
+    m_pendingEvents = (wxList *) NULL;
 #if wxUSE_THREADS
-    m_eventsLocker = new wxCriticalSection();
+#  if !defined(__VISAGECPP__)
+    m_eventsLocker = new wxCriticalSection;
+#  endif
 #endif
-    m_pendingEvents = (wxList *) NULL;
 }
 
 wxEvtHandler::~wxEvtHandler()
@@ -318,7 +1049,7 @@ wxEvtHandler::~wxEvtHandler()
         wxNode *node = m_dynamicEvents->First();
         while (node)
         {
-            wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
             if (entry->m_callbackUserData) delete entry->m_callbackUserData;
             delete entry;
             node = node->Next();
@@ -326,51 +1057,107 @@ wxEvtHandler::~wxEvtHandler()
         delete m_dynamicEvents;
     };
 
-#if wxUSE_THREADS
-    if (m_pendingEvents)
-      delete m_pendingEvents;
+    delete m_pendingEvents;
 
+#if wxUSE_THREADS
+#  if !defined(__VISAGECPP__)
     delete m_eventsLocker;
+#  endif
 #endif
 }
 
 #if wxUSE_THREADS
+
 bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
 {
-    wxEvent *event_main;
-    wxCriticalSectionLocker locker(*m_eventsLocker);
-
     // check that we are really in a child thread
-    wxASSERT( !wxThread::IsMain() );
+    wxASSERT_MSG( !wxThread::IsMain(),
+                  wxT("use ProcessEvent() in main thread") );
+
+    AddPendingEvent(event);
+
+    return TRUE;
+}
+
+#endif // wxUSE_THREADS
+
+void wxEvtHandler::AddPendingEvent(wxEvent& event)
+{
+    // 1) Add event to list of pending events of this event handler
+
+#if defined(__VISAGECPP__)
+    wxENTER_CRIT_SECT( m_eventsLocker);
+#else
+    wxENTER_CRIT_SECT( *m_eventsLocker);
+#endif
+
+    if ( !m_pendingEvents )
+      m_pendingEvents = new wxList;
+
+    wxEvent *event2 = (wxEvent *)event.Clone();
 
-    if (m_pendingEvents == NULL)
-      m_pendingEvents = new wxList();
+    m_pendingEvents->Append(event2);
 
-    event_main = (wxEvent *)event.Clone();
+#if defined(__VISAGECPP__)
+    wxLEAVE_CRIT_SECT( m_eventsLocker);
+#else
+    wxLEAVE_CRIT_SECT( *m_eventsLocker);
+#endif
+
+    // 2) Add this event handler to list of event handlers that
+    //    have pending events.
 
-    m_pendingEvents->Append(event_main);
+    wxENTER_CRIT_SECT(*wxPendingEventsLocker);
 
-    wxPendingEventsLocker->Enter();
+    if ( !wxPendingEvents )
+        wxPendingEvents = new wxList;
     wxPendingEvents->Append(this);
-    wxPendingEventsLocker->Leave();
 
-    return TRUE;
+    wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+    
+    // 3) Inform the system that new pending events are somwehere,
+    //    and that these should be processed in idle time.
+    wxWakeUpIdle();
 }
 
 void wxEvtHandler::ProcessPendingEvents()
 {
-    wxCriticalSectionLocker locker(*m_eventsLocker);
+#if defined(__VISAGECPP__)
+    wxENTER_CRIT_SECT( m_eventsLocker);
+#else
+    wxENTER_CRIT_SECT( *m_eventsLocker);
+#endif
+
     wxNode *node = m_pendingEvents->First();
-    wxEvent *event;
+    while ( node )
+    {
+        wxEvent *event = (wxEvent *)node->Data();
+        delete node;
+
+        // In ProcessEvent, new events might get added and
+           // we can safely leave the crtical section here.
+#if defined(__VISAGECPP__)
+        wxLEAVE_CRIT_SECT( m_eventsLocker);
+#else
+        wxLEAVE_CRIT_SECT( *m_eventsLocker);
+#endif
+        ProcessEvent(*event);
+        delete event;
+#if defined(__VISAGECPP__)
+        wxENTER_CRIT_SECT( m_eventsLocker);
+#else
+        wxENTER_CRIT_SECT( *m_eventsLocker);
+#endif
 
-    while (node != NULL) {
-      event = (wxEvent *)node->Data();
-      ProcessEvent(*event);
-      delete node;
-      node = m_pendingEvents->First();
+        node = m_pendingEvents->First();
     }
-}
+
+#if defined(__VISAGECPP__)
+    wxLEAVE_CRIT_SECT( m_eventsLocker);
+#else
+    wxLEAVE_CRIT_SECT( *m_eventsLocker);
 #endif
+}
 
 /*
  * Event table stuff
@@ -378,26 +1165,35 @@ void wxEvtHandler::ProcessPendingEvents()
 
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {
+#if wxUSE_GUI
     // check that our flag corresponds to reality
     wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
+#endif // wxUSE_GUI
 
     // An event handler can be enabled or disabled
     if ( GetEvtHandlerEnabled() )
     {
-#if wxUSE_THREADS
-       // Check whether we are in a child thread.
-        if (!wxThread::IsMain())
+    
+#if 0
+/*
+        What is this? When using GUI threads, a non main
+        threads can send an event and process it itself.
+        This breaks GTK's GUI threads, so please explain.
+*/
+
+        // Check whether we are in a child thread.
+        if ( !wxThread::IsMain() )
           return ProcessThreadEvent(event);
 #endif
-        // Handle per-instance dynamic event tables first
 
+        // Handle per-instance dynamic event tables first
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
             return TRUE;
 
         // Then static per-class event tables
-
         const wxEventTable *table = GetEventTable();
 
+#if wxUSE_GUI && wxUSE_VALIDATORS
         // Try the associated validator first, if this is a window.
         // Problem: if the event handler of the window has been replaced,
         // this wxEvtHandler may no longer be a window.
@@ -406,7 +1202,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
         // THIS CAN BE CURED if PushEventHandler is used instead of
         // SetEventHandler, and then processing will be passed down the
         // chain of event handlers.
-        if ( m_isWindow )
+        if (m_isWindow)
         {
             wxWindow *win = (wxWindow *)this;
 
@@ -421,9 +1217,10 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
                 }
             }
         }
+#endif
 
         // Search upwards through the inheritance hierarchy
-        while ( table )
+        while (table)
         {
             if ( SearchEventTable((wxEventTable&)*table, event) )
                 return TRUE;
@@ -438,6 +1235,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
             return TRUE;
     }
 
+#if wxUSE_GUI
     // Carry on up the parent-child hierarchy,
     // but only if event is a command event: it wouldn't
     // make sense for a parent to receive a child's size event, for example
@@ -448,6 +1246,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
         if (parent && !parent->IsBeingDeleted())
             return parent->GetEventHandler()->ProcessEvent(event);
     }
+#endif // wxUSE_GUI
 
     // Last try - application object.
     if ( wxTheApp && (this != wxTheApp) )
@@ -467,48 +1266,55 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
 
 bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
 {
-    int i = 0;
-    int commandId = event.GetId();
+    wxEventType eventType = event.GetEventType();
+    int eventId = event.GetId();
 
-    // BC++ doesn't like while (table.entries[i].m_fn)
-
-#ifdef __SC__
-    while (table.entries[i].m_fn != 0)
+    // BC++ doesn't like testing for m_fn without != 0
+    for ( int i = 0; table.entries[i].m_fn != 0; i++ )
+    {
+        // the line using reference exposes a bug in gcc: although it _seems_
+        // to work, it leads to weird crashes later on during program
+        // execution
+#ifdef __GNUG__
+        wxEventTableEntry entry = table.entries[i];
 #else
-    while (table.entries[i].m_fn != 0L)
+        const wxEventTableEntry& entry = table.entries[i];
 #endif
-    {
-        if ((event.GetEventType() == table.entries[i].m_eventType) &&
-                (table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1)
-                 (table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) ||
-                 (table.entries[i].m_lastId != -1 &&
-                  (commandId >= table.entries[i].m_id && commandId <= table.entries[i].m_lastId))))
+
+        // match only if the event type is the same and the id is either -1 in
+        // the event table (meaning "any") or the event id matches the id
+        // specified in the event table either exactly or by falling into
+        // range between first and last
+        if ( eventType == entry.m_eventType )
         {
-            event.Skip(FALSE);
-            event.m_callbackUserData = table.entries[i].m_callbackUserData;
+            int tableId1 = entry.m_id,
+                tableId2 = entry.m_lastId;
 
-            (this->*((wxEventFunction) (table.entries[i].m_fn)))(event);
+            if ( (tableId1 == -1) ||
+                 (tableId2 == -1 && eventId == tableId1) ||
+                 (tableId2 != -1 &&
+                    (eventId >= tableId1 && eventId <= tableId2)) )
+            {
+                event.Skip(FALSE);
+                event.m_callbackUserData = entry.m_callbackUserData;
 
-            if ( event.GetSkipped() )
-                return FALSE;
-            else
-                return TRUE;
+                (this->*((wxEventFunction) (entry.m_fn)))(event);
+
+                return !event.GetSkipped();
+            }
         }
-        i++;
     }
+
     return FALSE;
 }
+
 void wxEvtHandler::Connect( int id, int lastId,
-                            wxEventType eventType,
+                            int eventType,
                             wxObjectEventFunction func,
                             wxObject *userData )
 {
-    wxEventTableEntry *entry = new wxEventTableEntry;
-    entry->m_id = id;
-    entry->m_lastId = lastId;
-    entry->m_eventType = eventType;
-    entry->m_fn = func;
-    entry->m_callbackUserData = userData;
+    wxDynamicEventTableEntry *entry =
+        new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
 
     if (!m_dynamicEvents)
         m_dynamicEvents = new wxList;
@@ -516,17 +1322,44 @@ void wxEvtHandler::Connect( int id, int lastId,
     m_dynamicEvents->Append( (wxObject*) entry );
 }
 
+bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
+                  wxObjectEventFunction func,
+                  wxObject *userData )
+{
+    if (!m_dynamicEvents)
+        return FALSE;
+
+    wxNode *node = m_dynamicEvents->First();
+    while (node)
+    {
+        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+        if ((entry->m_id == id) &&
+            ((entry->m_lastId == lastId) || (lastId == -1)) &&
+            ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
+            ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
+            ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
+        {
+            if (entry->m_callbackUserData) delete entry->m_callbackUserData;
+            m_dynamicEvents->DeleteNode( node );
+            delete entry;
+            return TRUE;
+        }
+        node = node->Next();
+    }
+    return FALSE;
+}
+
 bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
 {
     wxCHECK_MSG( m_dynamicEvents, FALSE,
-                 _T("caller should check that we have dynamic events") );
+                 wxT("caller should check that we have dynamic events") );
 
     int commandId = event.GetId();
 
     wxNode *node = m_dynamicEvents->First();
     while (node)
     {
-        wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
 
         if (entry->m_fn)
         {
@@ -563,6 +1396,8 @@ bool wxEvtHandler::OnClose()
 }
 #endif // WXWIN_COMPATIBILITY
 
+#if wxUSE_GUI
+
 // Find a window with the focus, that is also a descendant of the given window.
 // This is used to determine the window to initially send commands to.
 wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
@@ -586,3 +1421,4 @@ wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
     return focusWin;
 }
 
+#endif // wxUSE_GUI