#include "wx/defs.h"
#include "wx/object.h"
-#include "wx/gdicmn.h"
-/*
- * Event types
- *
- */
+#if wxUSE_GUI
+ #include "wx/gdicmn.h"
+#endif
+
+#include "wx/thread.h"
+
+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxList;
+
+#if wxUSE_GUI
+ class WXDLLEXPORT wxClientData;
+ class WXDLLEXPORT wxDC;
+ class WXDLLEXPORT wxMenu;
+ class WXDLLEXPORT wxWindow;
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// Event types
+// ----------------------------------------------------------------------------
typedef int wxEventType;
const wxEventType wxEVT_KEY_UP = wxEVT_FIRST + 216;
/*
- * Scrollbar event identifiers
+ * wxScrollbar and wxSlider event identifiers
*/
const wxEventType wxEVT_SCROLL_TOP = wxEVT_FIRST + 300;
const wxEventType wxEVT_SCROLL_BOTTOM = wxEVT_FIRST + 301;
const wxEventType wxEVT_SCROLL_PAGEDOWN = wxEVT_FIRST + 305;
const wxEventType wxEVT_SCROLL_THUMBTRACK = wxEVT_FIRST + 306;
+ /*
+ * Scroll events from wxWindow
+ */
+const wxEventType wxEVT_SCROLLWIN_TOP = wxEVT_FIRST + 320;
+const wxEventType wxEVT_SCROLLWIN_BOTTOM = wxEVT_FIRST + 321;
+const wxEventType wxEVT_SCROLLWIN_LINEUP = wxEVT_FIRST + 322;
+const wxEventType wxEVT_SCROLLWIN_LINEDOWN = wxEVT_FIRST + 323;
+const wxEventType wxEVT_SCROLLWIN_PAGEUP = wxEVT_FIRST + 324;
+const wxEventType wxEVT_SCROLLWIN_PAGEDOWN = wxEVT_FIRST + 325;
+const wxEventType wxEVT_SCROLLWIN_THUMBTRACK = wxEVT_FIRST + 326;
+
+ /*
+ * System events
+ */
const wxEventType wxEVT_SIZE = wxEVT_FIRST + 400;
const wxEventType wxEVT_MOVE = wxEVT_FIRST + 401;
const wxEventType wxEVT_CLOSE_WINDOW = wxEVT_FIRST + 402;
const wxEventType wxEVT_INIT_DIALOG = wxEVT_FIRST + 437;
const wxEventType wxEVT_IDLE = wxEVT_FIRST + 438;
const wxEventType wxEVT_UPDATE_UI = wxEVT_FIRST + 439;
+
/* System misc. */
const wxEventType wxEVT_END_PROCESS = wxEVT_FIRST + 440;
+ /* Dial up events */
+const wxEventType wxEVT_DIALUP_CONNECTED = wxEVT_FIRST + 450;
+const wxEventType wxEVT_DIALUP_DISCONNECTED = wxEVT_FIRST + 451;
+
/* Generic command events */
/* Note: a click is a higher-level event than button down/up */
const wxEventType wxEVT_COMMAND_LEFT_CLICK = wxEVT_FIRST + 500;
const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING = wxEVT_FIRST + 612;
const wxEventType wxEVT_COMMAND_TREE_KEY_DOWN = wxEVT_FIRST + 613;
const wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxEVT_FIRST + 614;
+const wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxEVT_FIRST + 615;
+const wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 616;
/* List control event types */
const wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG = wxEVT_FIRST + 700;
const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxEVT_FIRST + 803;
#endif
+/* Splitter events */
+const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxEVT_FIRST + 850;
+const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxEVT_FIRST + 851;
+const wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxEVT_FIRST + 852;
+const wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT = wxEVT_FIRST + 853;
+
+/* Wizard events */
+const wxEventType wxEVT_WIZARD_PAGE_CHANGED = wxEVT_FIRST + 900;
+const wxEventType wxEVT_WIZARD_PAGE_CHANGING = wxEVT_FIRST + 901;
+const wxEventType wxEVT_WIZARD_CANCEL = wxEVT_FIRST + 902;
+
const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
/* Compatibility */
void Skip(bool skip = TRUE) { m_skipped = skip; }
bool GetSkipped() const { return m_skipped; };
+ // implementation only: this test is explicitlty anti OO and this functions
+ // exists only for optimization purposes
+ bool IsCommandEvent() const { return m_isCommandEvent; }
+
+ void CopyObject(wxObject& object_dest) const;
+
public:
- bool m_skipped;
wxObject* m_eventObject;
- char* m_eventHandle; // Handle of an underlying windowing system event
wxEventType m_eventType;
long m_timeStamp;
int m_id;
wxObject* m_callbackUserData;
+ bool m_skipped;
+
+ // optimization: instead of using costly IsKindOf() we keep a flag telling
+ // whether we're a command event (by far the most common case)
+ bool m_isCommandEvent;
};
+#if wxUSE_GUI
+
// Item or menu event class
/*
wxEVT_COMMAND_BUTTON_CLICKED
wxEVT_COMMAND_COMBOBOX_SELECTED
*/
-class WXDLLEXPORT wxClientData;
-
class WXDLLEXPORT wxCommandEvent : public wxEvent
{
DECLARE_DYNAMIC_CLASS(wxCommandEvent)
int GetSelection() const { return m_commandInt; }
// Set/Get listbox/choice selection string
- void SetString(char* s) { m_commandString = s; }
- char *GetString() const { return m_commandString; }
+ void SetString(const wxString& s) { m_commandString = s; }
+ wxString GetString() const { return m_commandString; }
// Get checkbox value
bool Checked() const { return (m_commandInt != 0); }
void SetInt(int i) { m_commandInt = i; }
long GetInt() const { return m_commandInt ; }
+ void CopyObject(wxObject& obj) const;
+
public:
- char* m_commandString; // String event argument
+ wxString m_commandString; // String event argument
int m_commandInt;
long m_extraLong; // Additional information (e.g. select/deselect)
void* m_clientData; // Arbitrary client data
DECLARE_DYNAMIC_CLASS(wxNotifyEvent)
};
-// Scroll event class
+// Scroll event class, derived form wxCommandEvent. wxScrollEvents are
+// sent by wxSlider and wxScrollbar.
/*
wxEVT_SCROLL_TOP
wxEVT_SCROLL_BOTTOM
void SetPosition(int pos) { m_commandInt = pos; }
};
+// ScrollWin event class, derived fom wxEvent. wxScrollWinEvents
+// are sent by wxWindow.
+/*
+ wxEVT_SCROLLWIN_TOP
+ wxEVT_SCROLLWIN_BOTTOM
+ wxEVT_SCROLLWIN_LINEUP
+ wxEVT_SCROLLWIN_LINEDOWN
+ wxEVT_SCROLLWIN_PAGEUP
+ wxEVT_SCROLLWIN_PAGEDOWN
+ wxEVT_SCROLLWIN_THUMBTRACK
+*/
+
+class WXDLLEXPORT wxScrollWinEvent : public wxEvent
+{
+ DECLARE_DYNAMIC_CLASS(wxScrollWinEvent)
+
+public:
+ wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
+ int pos = 0, int orient = 0);
+ ~wxScrollWinEvent() {}
+
+ /*
+ * Accessors
+ */
+
+ int GetOrientation() const { return (int) m_extraLong ; }
+ int GetPosition() const { return m_commandInt ; }
+ void SetOrientation(int orient) { m_extraLong = (long) orient; }
+ void SetPosition(int pos) { m_commandInt = pos; }
+
+ void CopyObject(wxObject& object_dest) const;
+public:
+ int m_commandInt; // Additional information
+ long m_extraLong;
+};
+
// Mouse event class
/*
wxEVT_NC_RIGHT_DCLICK,
*/
-class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxMouseEvent : public wxEvent
{
DECLARE_DYNAMIC_CLASS(wxMouseEvent)
bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
// Find the position of the event
- void Position(long *xpos, long *ypos) const { *xpos = m_x; *ypos = m_y; }
+ void GetPosition(long *xpos, long *ypos) const
+ { if (xpos) *xpos = m_x;
+ if (ypos) *ypos = m_y; }
+ void GetPosition(int *xpos, int *ypos) const
+ { if (xpos) *xpos = m_x;
+ if (ypos) *ypos = m_y; }
+ void Position(long *xpos, long *ypos) const
+ { if (xpos) *xpos = m_x;
+ if (ypos) *ypos = m_y; }
// Find the position of the event
wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
// Get Y position
long GetY() const { return m_y; }
+ void CopyObject(wxObject& obj) const;
+
public:
long m_x;
long m_y;
bool ShiftDown() const { return m_shiftDown; }
long KeyCode() const { return m_keyCode; }
-#if WXWIN_COMPATIBILITY
// Find the position of the event
- void Position(float *xpos, float *ypos) const
- { *xpos = (float)m_x; *ypos = (float)m_y; }
+ void GetPosition(long *xpos, long *ypos) const
+ { if (xpos) *xpos = m_x;
+ if (ypos) *ypos = m_y; }
+ void GetPosition(int *xpos, int *ypos) const
+ { if (xpos) *xpos = m_x;
+ if (ypos) *ypos = m_y; }
+
+ wxPoint GetPosition() const
+ { return wxPoint(m_x, m_y); }
// Get X position
- float GetX() const { return (float)m_x; }
+ long GetX() const { return m_x; }
// Get Y position
- float GetY() const { return (float)m_y; }
+ long GetY() const { return m_y; }
-#endif // WXWIN_COMPATIBILITY
+ void CopyObject(wxObject& obj) const;
public:
long m_x;
bool m_shiftDown;
bool m_altDown;
bool m_metaDown;
+ bool m_scanCode;
};
// Size event class
{ m_eventType = wxEVT_SIZE; m_id = id; }
wxSize GetSize() const { return m_size; }
+
+ void CopyObject(wxObject& obj) const;
};
// Move event class
{ m_eventType = wxEVT_MOVE; m_id = id; }
wxPoint GetPosition() const { return m_pos; }
+
+ void CopyObject(wxObject& obj) const;
};
// Paint event class
wxEVT_PAINT_ICON
*/
+#if defined(__WXDEBUG__) && defined(__WXMSW__)
+ // see comments in src/msw/dcclient.cpp where g_isPainting is defined
+ extern int g_isPainting;
+#endif // debug
+
class WXDLLEXPORT wxPaintEvent : public wxEvent
{
DECLARE_DYNAMIC_CLASS(wxPaintEvent)
public:
- wxPaintEvent(int Id = 0) { m_eventType = wxEVT_PAINT; m_id = Id; }
+ wxPaintEvent(int Id = 0)
+ {
+ m_eventType = wxEVT_PAINT;
+ m_id = Id;
+
+#if defined(__WXDEBUG__) && defined(__WXMSW__)
+ // set the internal flag for the duration of processing of WM_PAINT
+ g_isPainting++;
+#endif // debug
+ }
+
+#if defined(__WXDEBUG__) && defined(__WXMSW__)
+ ~wxPaintEvent()
+ {
+ g_isPainting--;
+ }
+#endif // debug
};
// Erase background event class
wxEVT_ERASE_BACKGROUND
*/
-class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxEraseEvent : public wxEvent
{
DECLARE_DYNAMIC_CLASS(wxEraseEvent)
wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL)
{ m_eventType = wxEVT_ERASE_BACKGROUND; m_id = Id; m_dc = dc; }
wxDC *GetDC() const { return m_dc; }
+
+ void CopyObject(wxObject& obj) const;
};
// Focus event class
{ m_eventType = type; m_active = active; m_id = Id; }
bool GetActive() const { return m_active; }
+ void CopyObject(wxObject& obj) const;
+
private:
bool m_active;
};
DECLARE_DYNAMIC_CLASS(wxMenuEvent)
public:
- wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0)
- { m_eventType = type; m_menuId = id; }
+ wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0)
+ { m_eventType = type; m_menuId = id; }
- int GetMenuId() const { return m_menuId; }
+ int GetMenuId() const { return m_menuId; }
+ void CopyObject(wxObject& obj) const;
private:
- int m_menuId;
+ int m_menuId;
};
// Window close or session close event class
{
// GetVeto() will return FALSE anyhow...
wxCHECK_RET( m_canVeto,
- "call to Veto() ignored (can't veto this event)" );
+ wxT("call to Veto() ignored (can't veto this event)") );
m_veto = veto;
}
bool GetForce() const { return m_force; }
#endif
+ void CopyObject(wxObject& obj) const;
+
protected:
bool m_loggingOff;
bool m_veto, m_canVeto;
void SetShow(bool show) { m_show = show; }
bool GetShow() const { return m_show; }
+ void CopyObject(wxObject& obj) const;
+
protected:
bool m_show;
};
// Was it a button event? (*doesn't* mean: is any button *down*?)
bool IsButton() const { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) ||
- (GetEventType() == wxEVT_JOY_BUTTON_DOWN)); }
+ (GetEventType() == wxEVT_JOY_BUTTON_UP)); }
// Was it a move event?
bool IsMove() const { return (GetEventType() == wxEVT_JOY_MOVE) ; }
bool ButtonIsDown(int but = wxJOY_BUTTON_ANY) const
{ return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) ||
((m_buttonState & but) == but)); }
+
+ void CopyObject(wxObject& obj) const;
};
// Drop files event class
wxPoint GetPosition() const { return m_pos; }
int GetNumberOfFiles() const { return m_noFiles; }
wxString *GetFiles() const { return m_files; }
-};
-// Idle event
-/*
- wxEVT_IDLE
- */
-
-class WXDLLEXPORT wxIdleEvent : public wxEvent
-{
- DECLARE_DYNAMIC_CLASS(wxIdleEvent)
-
-public:
- wxIdleEvent()
- { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }
-
- void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
- bool MoreRequested() const { return m_requestMore; }
-
-protected:
- bool m_requestMore;
+ void CopyObject(wxObject& obj) const;
};
// Update UI event
wxEVT_UPDATE_UI
*/
-class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxWindow;
-
class WXDLLEXPORT wxUpdateUIEvent : public wxCommandEvent
{
DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)
void Enable(bool enable) { m_enabled = enable; m_setEnabled = TRUE; }
void SetText(const wxString& text) { m_text = text; m_setText = TRUE; }
+ void CopyObject(wxObject& obj) const;
+
protected:
bool m_checked;
bool m_enabled;
void SetChangedWindow(wxWindow* win) { m_changedWindow = win; }
wxWindow* GetChangedWindow() const { return m_changedWindow; }
+ void CopyObject(wxObject& obj) const;
+
protected:
wxWindow* m_changedWindow;
};
void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
bool GetPaletteRealized() const { return m_paletteRealized; }
+ void CopyObject(wxObject& obj) const;
+
protected:
bool m_paletteRealized;
};
wxEVT_NAVIGATION_KEY
*/
// must derive from command event to be propagated to the parent
-class WXDLLEXPORT wxNavigationKeyEvent : public wxCommandEvent
+class WXDLLEXPORT wxNavigationKeyEvent : public wxCommandEvent
{
DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)
void SetCurrentFocus(wxWindow *win) { m_clientData = (void *)win; }
};
+// Window creation/destruction events: the first is sent as soon as window is
+// created (i.e. the underlying GUI object exists), but when the C++ object is
+// fully initialized (so virtual functions may be called). The second,
+// wxEVT_DESTROY, is sent right before the window is destroyed - again, it's
+// still safe to call virtual functions at this moment
+/*
+ wxEVT_CREATE
+ wxEVT_DESTROY
+ */
+
+class WXDLLEXPORT wxWindowCreateEvent : public wxEvent
+{
+ DECLARE_DYNAMIC_CLASS(wxWindowCreateEvent)
+
+public:
+ wxWindowCreateEvent(wxWindow *win = NULL);
+
+ wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
+};
+
+class WXDLLEXPORT wxWindowDestroyEvent : public wxEvent
+{
+ DECLARE_DYNAMIC_CLASS(wxWindowDestroyEvent)
+
+public:
+ wxWindowDestroyEvent(wxWindow *win = NULL);
+
+ wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
+};
+
+#endif // wxUSE_GUI
+
+// Idle event
+/*
+ wxEVT_IDLE
+ */
+
+class WXDLLEXPORT wxIdleEvent : public wxEvent
+{
+ DECLARE_DYNAMIC_CLASS(wxIdleEvent)
+
+public:
+ wxIdleEvent()
+ { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }
+
+ void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
+ bool MoreRequested() const { return m_requestMore; }
+
+ void CopyObject(wxObject& obj) const;
+
+protected:
+ bool m_requestMore;
+};
+
/* TODO
wxEVT_POWER,
- wxEVT_CREATE,
- wxEVT_DESTROY,
wxEVT_MOUSE_CAPTURE_CHANGED,
wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
// wxEVT_FONT_CHANGED, // WM_FONTCHANGE: roll into wxEVT_SETTING_CHANGED, but remember to propagate
wxEVT_COMPARE_ITEM
*/
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxControl;
-
-// struct WXDLLEXPORT wxEventTableEntry;
+// ============================================================================
+// event handler and related classes
+// ============================================================================
typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; }
void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; }
- void SetEvtHandlerEnabled(bool en) { m_enabled = en; }
+ void SetEvtHandlerEnabled(bool enabled) { m_enabled = enabled; }
bool GetEvtHandlerEnabled() const { return m_enabled; }
- virtual void OnCommand(wxWindow& WXUNUSED(win),
- wxCommandEvent& WXUNUSED(event))
- {
- }
+ // process an event right now
+ virtual bool ProcessEvent(wxEvent& event);
- // Called if child control has no
- // callback function
- // Default behaviour
- virtual long Default()
- { return GetNextHandler() ? GetNextHandler()->Default() : 0; };
+ // add an event to be processed later
+ void AddPendingEvent(wxEvent& event);
-#if WXWIN_COMPATIBILITY
- virtual bool OnClose();
-#endif
+ // process all pending events
+ void ProcessPendingEvents();
- virtual bool ProcessEvent(wxEvent& event);
- virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
+ // add a
+#if wxUSE_THREADS
+ bool ProcessThreadEvent(wxEvent& event);
+#endif
// Dynamic association of a member function handler with the event handler,
// id and event type
wxObject *userData = (wxObject *) NULL )
{ Connect(id, -1, eventType, func, userData); }
+ // implementation from now on
+ virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
bool SearchDynamicEventTable( wxEvent& event );
+#if wxUSE_THREADS
+ void ClearEventLocker() { delete m_eventsLocker; m_eventsLocker = NULL; };
+#endif
+
+ // old stuff
+
+#if WXWIN_COMPATIBILITY_2
+ virtual void OnCommand(wxWindow& WXUNUSED(win),
+ wxCommandEvent& WXUNUSED(event))
+ {
+ wxFAIL_MSG(wxT("shouldn't be called any more"));
+ }
+
+ // Called if child control has no callback function
+ virtual long Default()
+ { return GetNextHandler() ? GetNextHandler()->Default() : 0; };
+#endif // WXWIN_COMPATIBILITY_2
+
+#if WXWIN_COMPATIBILITY
+ virtual bool OnClose();
+#endif
+
private:
- static const wxEventTableEntry sm_eventTableEntries[];
+ static const wxEventTableEntry sm_eventTableEntries[];
protected:
- static const wxEventTable sm_eventTable;
- virtual const wxEventTable* GetEventTable() const;
+ static const wxEventTable sm_eventTable;
+
+ virtual const wxEventTable *GetEventTable() const;
+
protected:
- wxEvtHandler* m_nextHandler;
- wxEvtHandler* m_previousHandler;
- bool m_enabled; // Is event handler enabled?
- wxList* m_dynamicEvents;
+ wxEvtHandler* m_nextHandler;
+ wxEvtHandler* m_previousHandler;
+ wxList* m_dynamicEvents;
+ wxList* m_pendingEvents;
+#if wxUSE_THREADS
+ wxCriticalSection* m_eventsLocker;
+#endif
+
+ // optimization: instead of using costly IsKindOf() to decide whether we're
+ // a window (which is true in 99% of cases), use this flag
+ bool m_isWindow;
+
+ // Is event handler enabled?
+ bool m_enabled;
};
typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
+#if wxUSE_GUI
typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&);
typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&);
+typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&);
typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&);
typedef void (wxEvtHandler::*wxMoveEventFunction)(wxMoveEvent&);
typedef void (wxEvtHandler::*wxPaintEventFunction)(wxPaintEvent&);
typedef void (wxEvtHandler::*wxNavigationKeyEventFunction)(wxNavigationKeyEvent&);
typedef void (wxEvtHandler::*wxPaletteChangedEventFunction)(wxPaletteChangedEvent&);
typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEvent&);
+#endif // wxUSE_GUI
// N.B. In GNU-WIN32, you *have* to take the address of a member function
// (use &) or the compiler crashes...
#define EVT_NAVIGATION_KEY(func) { wxEVT_NAVIGATION_KEY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNavigationKeyEventFunction) & func, (wxObject *) NULL },
#define EVT_PALETTE_CHANGED(func) { wxEVT_PALETTE_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaletteChangedEventFunction) & func, (wxObject *) NULL },
#define EVT_QUERY_NEW_PALETTE(func) { wxEVT_QUERY_NEW_PALETTE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL },
+#define EVT_WINDOW_CREATE(func) { wxEVT_CREATE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL },
+#define EVT_WINDOW_DESTROY(func) { wxEVT_DESTROY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL },
// Mouse events
#define EVT_LEFT_DOWN(func) { wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
// EVT_COMMAND
#define EVT_COMMAND(id, event, fn) { event, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMMAND_RANGE(id1, id2, event, fn) { eventId, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-
-// Scrolling
+#define EVT_COMMAND_RANGE(id1, id2, event, fn) { event, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
+
+// Scrolling from wxWindow (sent to wxScrolledWindow)
+#define EVT_SCROLLWIN(func) \
+ { wxEVT_SCROLLWIN_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\
+ { wxEVT_SCROLLWIN_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\
+ { wxEVT_SCROLLWIN_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\
+ { wxEVT_SCROLLWIN_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\
+ { wxEVT_SCROLLWIN_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\
+ { wxEVT_SCROLLWIN_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\
+ { wxEVT_SCROLLWIN_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },
+
+#define EVT_SCROLLWIN_TOP(func) { wxEVT_SCROLLWIN_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },
+#define EVT_SCROLLWIN_BOTTOM(func) { wxEVT_SCROLLWIN_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },
+#define EVT_SCROLLWIN_LINEUP(func) { wxEVT_SCROLLWIN_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },
+#define EVT_SCROLLWIN_LINEDOWN(func) { wxEVT_SCROLLWIN_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },
+#define EVT_SCROLLWIN_PAGEUP(func) { wxEVT_SCROLLWIN_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },
+#define EVT_SCROLLWIN_PAGEDOWN(func) { wxEVT_SCROLLWIN_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },
+#define EVT_SCROLLWIN_THUMBTRACK(func) { wxEVT_SCROLLWIN_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },
+
+// Scrolling from wxSlider and wxScrollBar
#define EVT_SCROLL(func) \
{ wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
#define EVT_SCROLL_PAGEDOWN(func) { wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
#define EVT_SCROLL_THUMBTRACK(func) { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-// Scrolling, with an id
+// Scrolling from wxSlider and wxScrollBar, with an id
#define EVT_COMMAND_SCROLL(id, func) \
{ wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
{ wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
#define EVT_UPDATE_UI(id, func) \
{ wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },\
+// ----------------------------------------------------------------------------
+// Global data
+// ----------------------------------------------------------------------------
+
+// for pending event processing - notice that there is intentionally no
+// WXDLLEXPORT here
+extern wxList *wxPendingEvents;
+#if wxUSE_THREADS
+ extern wxCriticalSection *wxPendingEventsLocker;
+#endif
+
+// ----------------------------------------------------------------------------
+// Helper functions
+// ----------------------------------------------------------------------------
+
+#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);
+
+#endif // wxUSE_GUI
+
#endif
// _WX_EVENTH__