1. implemented wxRegKey::Copy() and CopyValue()
2. regtest sample doesn't crash any more 3. wxLogGui uses msg box for only 1 message 4. "const wxEventType" => "enum" 5. wxEVT_COMMAND_TREE_END_DRAG introduced - see sample for example 6. fixed several non fatal bugs in wxRegKey 7. many changes in regtest sample, not tested yet git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -46,268 +46,52 @@
|
||||
#include "wx/validate.h"
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
|
||||
#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
|
||||
// must define these static for VA or else you get multiply defined symbols everywhere
|
||||
const wxEventType wxEVT_NULL = 0;
|
||||
const wxEventType wxEVT_FIRST = 10000;
|
||||
|
||||
const wxEventType wxEVT_COMMAND_BUTTON_CLICKED = wxEVT_FIRST + 1;
|
||||
const wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED = wxEVT_FIRST + 2;
|
||||
const wxEventType wxEVT_COMMAND_CHOICE_SELECTED = wxEVT_FIRST + 3;
|
||||
const wxEventType wxEVT_COMMAND_LISTBOX_SELECTED = wxEVT_FIRST + 4;
|
||||
const wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxEVT_FIRST + 5;
|
||||
const wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxEVT_FIRST + 6;
|
||||
const wxEventType wxEVT_COMMAND_TEXT_UPDATED = wxEVT_FIRST + 7;
|
||||
const wxEventType wxEVT_COMMAND_TEXT_ENTER = wxEVT_FIRST + 8;
|
||||
const wxEventType wxEVT_COMMAND_MENU_SELECTED = wxEVT_FIRST + 9;
|
||||
const wxEventType wxEVT_COMMAND_TOOL_CLICKED = wxEVT_COMMAND_MENU_SELECTED;
|
||||
const wxEventType wxEVT_COMMAND_SLIDER_UPDATED = wxEVT_FIRST + 10;
|
||||
const wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED = wxEVT_FIRST + 11;
|
||||
const wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxEVT_FIRST + 12;
|
||||
//const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use wxEVT_SCROLL... events
|
||||
const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED = wxEVT_FIRST + 13;
|
||||
const wxEventType wxEVT_COMMAND_VLBOX_SELECTED = wxEVT_FIRST + 14;
|
||||
const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_FIRST + 15;
|
||||
const wxEventType wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16;
|
||||
const wxEventType wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17;
|
||||
const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED = wxEVT_FIRST + 18;
|
||||
|
||||
/* Sockets send events, too */
|
||||
const wxEventType wxEVT_SOCKET = wxEVT_FIRST + 50;
|
||||
const wxEventType wxEVT_TIMER = wxEVT_FIRST + 80;
|
||||
|
||||
/* Mouse event types */
|
||||
const wxEventType wxEVT_LEFT_DOWN = wxEVT_FIRST + 100;
|
||||
const wxEventType wxEVT_LEFT_UP = wxEVT_FIRST + 101;
|
||||
const wxEventType wxEVT_MIDDLE_DOWN = wxEVT_FIRST + 102;
|
||||
const wxEventType wxEVT_MIDDLE_UP = wxEVT_FIRST + 103;
|
||||
const wxEventType wxEVT_RIGHT_DOWN = wxEVT_FIRST + 104;
|
||||
const wxEventType wxEVT_RIGHT_UP = wxEVT_FIRST + 105;
|
||||
const wxEventType wxEVT_MOTION = wxEVT_FIRST + 106;
|
||||
const wxEventType wxEVT_ENTER_WINDOW = wxEVT_FIRST + 107;
|
||||
const wxEventType wxEVT_LEAVE_WINDOW = wxEVT_FIRST + 108;
|
||||
const wxEventType wxEVT_LEFT_DCLICK = wxEVT_FIRST + 109;
|
||||
const wxEventType wxEVT_MIDDLE_DCLICK = wxEVT_FIRST + 110;
|
||||
const wxEventType wxEVT_RIGHT_DCLICK = wxEVT_FIRST + 111;
|
||||
const wxEventType wxEVT_SET_FOCUS = wxEVT_FIRST + 112;
|
||||
const wxEventType wxEVT_KILL_FOCUS = wxEVT_FIRST + 113;
|
||||
|
||||
/* Non-client mouse events */
|
||||
const wxEventType wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 200;
|
||||
const wxEventType wxEVT_NC_LEFT_UP = wxEVT_FIRST + 201;
|
||||
const wxEventType wxEVT_NC_MIDDLE_DOWN = wxEVT_FIRST + 202;
|
||||
const wxEventType wxEVT_NC_MIDDLE_UP = wxEVT_FIRST + 203;
|
||||
const wxEventType wxEVT_NC_RIGHT_DOWN = wxEVT_FIRST + 204;
|
||||
const wxEventType wxEVT_NC_RIGHT_UP = wxEVT_FIRST + 205;
|
||||
const wxEventType wxEVT_NC_MOTION = wxEVT_FIRST + 206;
|
||||
const wxEventType wxEVT_NC_ENTER_WINDOW = wxEVT_FIRST + 207;
|
||||
const wxEventType wxEVT_NC_LEAVE_WINDOW = wxEVT_FIRST + 208;
|
||||
const wxEventType wxEVT_NC_LEFT_DCLICK = wxEVT_FIRST + 209;
|
||||
const wxEventType wxEVT_NC_MIDDLE_DCLICK = wxEVT_FIRST + 210;
|
||||
const wxEventType wxEVT_NC_RIGHT_DCLICK = wxEVT_FIRST + 211;
|
||||
|
||||
/* Character input event type */
|
||||
const wxEventType wxEVT_CHAR = wxEVT_FIRST + 212;
|
||||
const wxEventType wxEVT_CHAR_HOOK = wxEVT_FIRST + 213;
|
||||
const wxEventType wxEVT_NAVIGATION_KEY = wxEVT_FIRST + 214;
|
||||
const wxEventType wxEVT_KEY_DOWN = wxEVT_FIRST + 215;
|
||||
const wxEventType wxEVT_KEY_UP = wxEVT_FIRST + 216;
|
||||
|
||||
/*
|
||||
* 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_LINEUP = wxEVT_FIRST + 302;
|
||||
const wxEventType wxEVT_SCROLL_LINEDOWN = wxEVT_FIRST + 303;
|
||||
const wxEventType wxEVT_SCROLL_PAGEUP = wxEVT_FIRST + 304;
|
||||
const wxEventType wxEVT_SCROLL_PAGEDOWN = wxEVT_FIRST + 305;
|
||||
const wxEventType wxEVT_SCROLL_THUMBTRACK = wxEVT_FIRST + 306;
|
||||
const wxEventType wxEVT_SCROLL_THUMBRELEASE = wxEVT_FIRST + 307;
|
||||
|
||||
/*
|
||||
* 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;
|
||||
const wxEventType wxEVT_SCROLLWIN_THUMBRELEASE = wxEVT_FIRST + 327;
|
||||
|
||||
/*
|
||||
* 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_END_SESSION = wxEVT_FIRST + 403;
|
||||
const wxEventType wxEVT_QUERY_END_SESSION = wxEVT_FIRST + 404;
|
||||
const wxEventType wxEVT_ACTIVATE_APP = wxEVT_FIRST + 405;
|
||||
const wxEventType wxEVT_POWER = wxEVT_FIRST + 406;
|
||||
const wxEventType wxEVT_ACTIVATE = wxEVT_FIRST + 409;
|
||||
const wxEventType wxEVT_CREATE = wxEVT_FIRST + 410;
|
||||
const wxEventType wxEVT_DESTROY = wxEVT_FIRST + 411;
|
||||
const wxEventType wxEVT_SHOW = wxEVT_FIRST + 412;
|
||||
const wxEventType wxEVT_ICONIZE = wxEVT_FIRST + 413;
|
||||
const wxEventType wxEVT_MAXIMIZE = wxEVT_FIRST + 414;
|
||||
const wxEventType wxEVT_MOUSE_CAPTURE_CHANGED = wxEVT_FIRST + 415;
|
||||
const wxEventType wxEVT_PAINT = wxEVT_FIRST + 416;
|
||||
const wxEventType wxEVT_ERASE_BACKGROUND = wxEVT_FIRST + 417;
|
||||
const wxEventType wxEVT_NC_PAINT = wxEVT_FIRST + 418;
|
||||
const wxEventType wxEVT_PAINT_ICON = wxEVT_FIRST + 419;
|
||||
const wxEventType wxEVT_MENU_CHAR = wxEVT_FIRST + 420;
|
||||
const wxEventType wxEVT_MENU_INIT = wxEVT_FIRST + 421;
|
||||
const wxEventType wxEVT_MENU_HIGHLIGHT = wxEVT_FIRST + 422;
|
||||
const wxEventType wxEVT_POPUP_MENU_INIT = wxEVT_FIRST + 423;
|
||||
const wxEventType wxEVT_CONTEXT_MENU = wxEVT_FIRST + 424;
|
||||
const wxEventType wxEVT_SYS_COLOUR_CHANGED = wxEVT_FIRST + 425;
|
||||
const wxEventType wxEVT_SETTING_CHANGED = wxEVT_FIRST + 426;
|
||||
const wxEventType wxEVT_QUERY_NEW_PALETTE = wxEVT_FIRST + 427;
|
||||
const wxEventType wxEVT_PALETTE_CHANGED = wxEVT_FIRST + 428;
|
||||
const wxEventType wxEVT_JOY_BUTTON_DOWN = wxEVT_FIRST + 429;
|
||||
const wxEventType wxEVT_JOY_BUTTON_UP = wxEVT_FIRST + 430;
|
||||
const wxEventType wxEVT_JOY_MOVE = wxEVT_FIRST + 431;
|
||||
const wxEventType wxEVT_JOY_ZMOVE = wxEVT_FIRST + 432;
|
||||
const wxEventType wxEVT_DROP_FILES = wxEVT_FIRST + 433;
|
||||
const wxEventType wxEVT_DRAW_ITEM = wxEVT_FIRST + 434;
|
||||
const wxEventType wxEVT_MEASURE_ITEM = wxEVT_FIRST + 435;
|
||||
const wxEventType wxEVT_COMPARE_ITEM = wxEVT_FIRST + 436;
|
||||
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_LEFT_DCLICK = wxEVT_FIRST + 501;
|
||||
const wxEventType wxEVT_COMMAND_RIGHT_CLICK = wxEVT_FIRST + 502;
|
||||
const wxEventType wxEVT_COMMAND_RIGHT_DCLICK = wxEVT_FIRST + 503;
|
||||
const wxEventType wxEVT_COMMAND_SET_FOCUS = wxEVT_FIRST + 504;
|
||||
const wxEventType wxEVT_COMMAND_KILL_FOCUS = wxEVT_FIRST + 505;
|
||||
const wxEventType wxEVT_COMMAND_ENTER = wxEVT_FIRST + 506;
|
||||
|
||||
/* Tree control event types */
|
||||
const wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG = wxEVT_FIRST + 600;
|
||||
const wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxEVT_FIRST + 601;
|
||||
const wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxEVT_FIRST + 602;
|
||||
const wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxEVT_FIRST + 603;
|
||||
const wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM = wxEVT_FIRST + 604;
|
||||
const wxEventType wxEVT_COMMAND_TREE_GET_INFO = wxEVT_FIRST + 605;
|
||||
const wxEventType wxEVT_COMMAND_TREE_SET_INFO = wxEVT_FIRST + 606;
|
||||
const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxEVT_FIRST + 607;
|
||||
const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxEVT_FIRST + 608;
|
||||
const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxEVT_FIRST + 609;
|
||||
const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxEVT_FIRST + 610;
|
||||
const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED = wxEVT_FIRST + 611;
|
||||
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_LIST_BEGIN_RDRAG = wxEVT_FIRST + 701;
|
||||
const wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxEVT_FIRST + 702;
|
||||
const wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxEVT_FIRST + 703;
|
||||
const wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM = wxEVT_FIRST + 704;
|
||||
const wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxEVT_FIRST + 705;
|
||||
const wxEventType wxEVT_COMMAND_LIST_GET_INFO = wxEVT_FIRST + 706;
|
||||
const wxEventType wxEVT_COMMAND_LIST_SET_INFO = wxEVT_FIRST + 707;
|
||||
const wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED = wxEVT_FIRST + 708;
|
||||
const wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxEVT_FIRST + 709;
|
||||
const wxEventType wxEVT_COMMAND_LIST_KEY_DOWN = wxEVT_FIRST + 710;
|
||||
const wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM = wxEVT_FIRST + 711;
|
||||
const wxEventType wxEVT_COMMAND_LIST_COL_CLICK = wxEVT_FIRST + 712;
|
||||
const wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxEVT_FIRST + 713;
|
||||
const wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 714;
|
||||
const wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxEVT_FIRST + 715;
|
||||
|
||||
/* Tab and notebook control event types */
|
||||
const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED = wxEVT_FIRST + 800;
|
||||
const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING = wxEVT_FIRST + 801;
|
||||
const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxEVT_FIRST + 802;
|
||||
const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxEVT_FIRST + 803;
|
||||
|
||||
/* 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;
|
||||
|
||||
/* Calendar events */
|
||||
const wxEventType wxEVT_CALENDAR_SEL_CHANGED = wxEVT_FIRST + 950;
|
||||
const wxEventType wxEVT_CALENDAR_DAY_CHANGED = wxEVT_FIRST + 951;
|
||||
const wxEventType wxEVT_CALENDAR_MONTH_CHANGED = wxEVT_FIRST + 952;
|
||||
const wxEventType wxEVT_CALENDAR_YEAR_CHANGED = wxEVT_FIRST + 953;
|
||||
const wxEventType wxEVT_CALENDAR_DOUBLECLICKED = wxEVT_FIRST + 954;
|
||||
const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955;
|
||||
|
||||
const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxWin macros
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
|
||||
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(wxPaintEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, 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)
|
||||
#endif // wxUSE_GUI
|
||||
#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(wxPaintEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, 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)
|
||||
#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[] =
|
||||
{ { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } };
|
||||
const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
|
||||
{ { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } };
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -421,6 +205,19 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
|
||||
{
|
||||
m_extraLong = orient;
|
||||
m_commandInt = pos;
|
||||
<<<<<<< event.cpp
|
||||
m_isScrolling = TRUE;
|
||||
}
|
||||
|
||||
void wxScrollEvent::CopyObject(wxObject& obj_d) const
|
||||
{
|
||||
wxScrollEvent *obj = (wxScrollEvent*)&obj_d;
|
||||
|
||||
wxCommandEvent::CopyObject(obj_d);
|
||||
|
||||
obj->m_isScrolling = m_isScrolling;
|
||||
=======
|
||||
>>>>>>> 1.69
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user