From 67b81440f079f88e6202a199fd5763af73bbac0f Mon Sep 17 00:00:00 2001 From: David Webster Date: Fri, 28 Jan 2000 23:37:54 +0000 Subject: [PATCH] VA 4.0 fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 340 +++++++++++++++++++++--------------------- include/wx/filefn.h | 4 +- include/wx/string.h | 4 +- src/common/event.cpp | 221 --------------------------- src/common/filefn.cpp | 4 - src/common/string.cpp | 9 -- 6 files changed, 174 insertions(+), 408 deletions(-) diff --git a/include/wx/event.h b/include/wx/event.h index e72c496171..8ffac8587d 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -45,215 +45,215 @@ class WXDLLEXPORT wxList; typedef int wxEventType; #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 -// must define these in the .cpp for VA or else you get multiply defined symbols everywhere -extern const wxEventType wxEVT_NULL; -extern const wxEventType wxEVT_FIRST; - -extern const wxEventType wxEVT_COMMAND_BUTTON_CLICKED; -extern const wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED; -extern const wxEventType wxEVT_COMMAND_CHOICE_SELECTED; -extern const wxEventType wxEVT_COMMAND_LISTBOX_SELECTED; -extern const wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; -extern const wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED; -extern const wxEventType wxEVT_COMMAND_TEXT_UPDATED; -extern const wxEventType wxEVT_COMMAND_TEXT_ENTER; -extern const wxEventType wxEVT_COMMAND_MENU_SELECTED; -extern const wxEventType wxEVT_COMMAND_TOOL_CLICKED; -extern const wxEventType wxEVT_COMMAND_SLIDER_UPDATED; -extern const wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED; -extern const wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED; -extern const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED; -extern const wxEventType wxEVT_COMMAND_VLBOX_SELECTED; -extern const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED; -extern const wxEventType wxEVT_COMMAND_TOOL_RCLICKED; -extern const wxEventType wxEVT_COMMAND_TOOL_ENTER; -extern const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED; +// must define these static for VA or else you get multiply defined symbols everywhere +static const wxEventType wxEVT_NULL = 0; +static const wxEventType wxEVT_FIRST = 10000; + +static const wxEventType wxEVT_COMMAND_BUTTON_CLICKED = wxEVT_FIRST + 1; +static const wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED = wxEVT_FIRST + 2; +static const wxEventType wxEVT_COMMAND_CHOICE_SELECTED = wxEVT_FIRST + 3; +static const wxEventType wxEVT_COMMAND_LISTBOX_SELECTED = wxEVT_FIRST + 4; +static const wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxEVT_FIRST + 5; +static const wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxEVT_FIRST + 6; +static const wxEventType wxEVT_COMMAND_TEXT_UPDATED = wxEVT_FIRST + 7; +static const wxEventType wxEVT_COMMAND_TEXT_ENTER = wxEVT_FIRST + 8; +static const wxEventType wxEVT_COMMAND_MENU_SELECTED = wxEVT_FIRST + 9; +static const wxEventType wxEVT_COMMAND_TOOL_CLICKED = wxEVT_COMMAND_MENU_SELECTED; +static const wxEventType wxEVT_COMMAND_SLIDER_UPDATED = wxEVT_FIRST + 10; +static const wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED = wxEVT_FIRST + 11; +static const wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxEVT_FIRST + 12; +//static const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use wxEVT_SCROLL... events +static const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED = wxEVT_FIRST + 13; +static const wxEventType wxEVT_COMMAND_VLBOX_SELECTED = wxEVT_FIRST + 14; +static const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_FIRST + 15; +static const wxEventType wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16; +static const wxEventType wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17; +static const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED = wxEVT_FIRST + 18; /* Sockets send events, too */ -extern const wxEventType wxEVT_SOCKET; +static const wxEventType wxEVT_SOCKET = wxEVT_FIRST + 50; /* Mouse event types */ -extern const wxEventType wxEVT_LEFT_DOWN; -extern const wxEventType wxEVT_LEFT_UP; -extern const wxEventType wxEVT_MIDDLE_DOWN; -extern const wxEventType wxEVT_MIDDLE_UP; -extern const wxEventType wxEVT_RIGHT_DOWN; -extern const wxEventType wxEVT_RIGHT_UP; -extern const wxEventType wxEVT_MOTION; -extern const wxEventType wxEVT_ENTER_WINDOW; -extern const wxEventType wxEVT_LEAVE_WINDOW; -extern const wxEventType wxEVT_LEFT_DCLICK; -extern const wxEventType wxEVT_MIDDLE_DCLICK; -extern const wxEventType wxEVT_RIGHT_DCLICK; -extern const wxEventType wxEVT_SET_FOCUS; -extern const wxEventType wxEVT_KILL_FOCUS; +static const wxEventType wxEVT_LEFT_DOWN = wxEVT_FIRST + 100; +static const wxEventType wxEVT_LEFT_UP = wxEVT_FIRST + 101; +static const wxEventType wxEVT_MIDDLE_DOWN = wxEVT_FIRST + 102; +static const wxEventType wxEVT_MIDDLE_UP = wxEVT_FIRST + 103; +static const wxEventType wxEVT_RIGHT_DOWN = wxEVT_FIRST + 104; +static const wxEventType wxEVT_RIGHT_UP = wxEVT_FIRST + 105; +static const wxEventType wxEVT_MOTION = wxEVT_FIRST + 106; +static const wxEventType wxEVT_ENTER_WINDOW = wxEVT_FIRST + 107; +static const wxEventType wxEVT_LEAVE_WINDOW = wxEVT_FIRST + 108; +static const wxEventType wxEVT_LEFT_DCLICK = wxEVT_FIRST + 109; +static const wxEventType wxEVT_MIDDLE_DCLICK = wxEVT_FIRST + 110; +static const wxEventType wxEVT_RIGHT_DCLICK = wxEVT_FIRST + 111; +static const wxEventType wxEVT_SET_FOCUS = wxEVT_FIRST + 112; +static const wxEventType wxEVT_KILL_FOCUS = wxEVT_FIRST + 113; /* Non-client mouse events */ -extern const wxEventType wxEVT_NC_LEFT_DOWN; -extern const wxEventType wxEVT_NC_LEFT_UP; -extern const wxEventType wxEVT_NC_MIDDLE_DOWN; -extern const wxEventType wxEVT_NC_MIDDLE_UP; -extern const wxEventType wxEVT_NC_RIGHT_DOWN; -extern const wxEventType wxEVT_NC_RIGHT_UP; -extern const wxEventType wxEVT_NC_MOTION; -extern const wxEventType wxEVT_NC_ENTER_WINDOW; -extern const wxEventType wxEVT_NC_LEAVE_WINDOW; -extern const wxEventType wxEVT_NC_LEFT_DCLICK; -extern const wxEventType wxEVT_NC_MIDDLE_DCLICK; -extern const wxEventType wxEVT_NC_RIGHT_DCLICK; +static const wxEventType wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 200; +static const wxEventType wxEVT_NC_LEFT_UP = wxEVT_FIRST + 201; +static const wxEventType wxEVT_NC_MIDDLE_DOWN = wxEVT_FIRST + 202; +static const wxEventType wxEVT_NC_MIDDLE_UP = wxEVT_FIRST + 203; +static const wxEventType wxEVT_NC_RIGHT_DOWN = wxEVT_FIRST + 204; +static const wxEventType wxEVT_NC_RIGHT_UP = wxEVT_FIRST + 205; +static const wxEventType wxEVT_NC_MOTION = wxEVT_FIRST + 206; +static const wxEventType wxEVT_NC_ENTER_WINDOW = wxEVT_FIRST + 207; +static const wxEventType wxEVT_NC_LEAVE_WINDOW = wxEVT_FIRST + 208; +static const wxEventType wxEVT_NC_LEFT_DCLICK = wxEVT_FIRST + 209; +static const wxEventType wxEVT_NC_MIDDLE_DCLICK = wxEVT_FIRST + 210; +static const wxEventType wxEVT_NC_RIGHT_DCLICK = wxEVT_FIRST + 211; /* Character input event type */ -extern const wxEventType wxEVT_CHAR; -extern const wxEventType wxEVT_CHAR_HOOK; -extern const wxEventType wxEVT_NAVIGATION_KEY; -extern const wxEventType wxEVT_KEY_DOWN; -extern const wxEventType wxEVT_KEY_UP; +static const wxEventType wxEVT_CHAR = wxEVT_FIRST + 212; +static const wxEventType wxEVT_CHAR_HOOK = wxEVT_FIRST + 213; +static const wxEventType wxEVT_NAVIGATION_KEY = wxEVT_FIRST + 214; +static const wxEventType wxEVT_KEY_DOWN = wxEVT_FIRST + 215; +static const wxEventType wxEVT_KEY_UP = wxEVT_FIRST + 216; /* * wxScrollbar and wxSlider event identifiers */ -extern const wxEventType wxEVT_SCROLL_TOP; -extern const wxEventType wxEVT_SCROLL_BOTTOM; -extern const wxEventType wxEVT_SCROLL_LINEUP; -extern const wxEventType wxEVT_SCROLL_LINEDOWN; -extern const wxEventType wxEVT_SCROLL_PAGEUP; -extern const wxEventType wxEVT_SCROLL_PAGEDOWN; -extern const wxEventType wxEVT_SCROLL_THUMBTRACK; +static const wxEventType wxEVT_SCROLL_TOP = wxEVT_FIRST + 300; +static const wxEventType wxEVT_SCROLL_BOTTOM = wxEVT_FIRST + 301; +static const wxEventType wxEVT_SCROLL_LINEUP = wxEVT_FIRST + 302; +static const wxEventType wxEVT_SCROLL_LINEDOWN = wxEVT_FIRST + 303; +static const wxEventType wxEVT_SCROLL_PAGEUP = wxEVT_FIRST + 304; +static const wxEventType wxEVT_SCROLL_PAGEDOWN = wxEVT_FIRST + 305; +static const wxEventType wxEVT_SCROLL_THUMBTRACK = wxEVT_FIRST + 306; /* * Scroll events from wxWindow */ -extern const wxEventType wxEVT_SCROLLWIN_TOP; -extern const wxEventType wxEVT_SCROLLWIN_BOTTOM; -extern const wxEventType wxEVT_SCROLLWIN_LINEUP; -extern const wxEventType wxEVT_SCROLLWIN_LINEDOWN; -extern const wxEventType wxEVT_SCROLLWIN_PAGEUP; -extern const wxEventType wxEVT_SCROLLWIN_PAGEDOWN; -extern const wxEventType wxEVT_SCROLLWIN_THUMBTRACK; +static const wxEventType wxEVT_SCROLLWIN_TOP = wxEVT_FIRST + 320; +static const wxEventType wxEVT_SCROLLWIN_BOTTOM = wxEVT_FIRST + 321; +static const wxEventType wxEVT_SCROLLWIN_LINEUP = wxEVT_FIRST + 322; +static const wxEventType wxEVT_SCROLLWIN_LINEDOWN = wxEVT_FIRST + 323; +static const wxEventType wxEVT_SCROLLWIN_PAGEUP = wxEVT_FIRST + 324; +static const wxEventType wxEVT_SCROLLWIN_PAGEDOWN = wxEVT_FIRST + 325; +static const wxEventType wxEVT_SCROLLWIN_THUMBTRACK = wxEVT_FIRST + 326; /* * System events */ -extern const wxEventType wxEVT_SIZE; -extern const wxEventType wxEVT_MOVE; -extern const wxEventType wxEVT_CLOSE_WINDOW; -extern const wxEventType wxEVT_END_SESSION; -extern const wxEventType wxEVT_QUERY_END_SESSION; -extern const wxEventType wxEVT_ACTIVATE_APP; -extern const wxEventType wxEVT_POWER; -extern const wxEventType wxEVT_ACTIVATE; -extern const wxEventType wxEVT_CREATE; -extern const wxEventType wxEVT_DESTROY; -extern const wxEventType wxEVT_SHOW; -extern const wxEventType wxEVT_ICONIZE; -extern const wxEventType wxEVT_MAXIMIZE; -extern const wxEventType wxEVT_MOUSE_CAPTURE_CHANGED; -extern const wxEventType wxEVT_PAINT; -extern const wxEventType wxEVT_ERASE_BACKGROUND; -extern const wxEventType wxEVT_NC_PAINT; -extern const wxEventType wxEVT_PAINT_ICON; -extern const wxEventType wxEVT_MENU_CHAR; -extern const wxEventType wxEVT_MENU_INIT; -extern const wxEventType wxEVT_MENU_HIGHLIGHT; -extern const wxEventType wxEVT_POPUP_MENU_INIT; -extern const wxEventType wxEVT_CONTEXT_MENU; -extern const wxEventType wxEVT_SYS_COLOUR_CHANGED; -extern const wxEventType wxEVT_SETTING_CHANGED; -extern const wxEventType wxEVT_QUERY_NEW_PALETTE; -extern const wxEventType wxEVT_PALETTE_CHANGED; -extern const wxEventType wxEVT_JOY_BUTTON_DOWN; -extern const wxEventType wxEVT_JOY_BUTTON_UP; -extern const wxEventType wxEVT_JOY_MOVE; -extern const wxEventType wxEVT_JOY_ZMOVE; -extern const wxEventType wxEVT_DROP_FILES; -extern const wxEventType wxEVT_DRAW_ITEM; -extern const wxEventType wxEVT_MEASURE_ITEM; -extern const wxEventType wxEVT_COMPARE_ITEM; -extern const wxEventType wxEVT_INIT_DIALOG; -extern const wxEventType wxEVT_IDLE; -extern const wxEventType wxEVT_UPDATE_UI; +static const wxEventType wxEVT_SIZE = wxEVT_FIRST + 400; +static const wxEventType wxEVT_MOVE = wxEVT_FIRST + 401; +static const wxEventType wxEVT_CLOSE_WINDOW = wxEVT_FIRST + 402; +static const wxEventType wxEVT_END_SESSION = wxEVT_FIRST + 403; +static const wxEventType wxEVT_QUERY_END_SESSION = wxEVT_FIRST + 404; +static const wxEventType wxEVT_ACTIVATE_APP = wxEVT_FIRST + 405; +static const wxEventType wxEVT_POWER = wxEVT_FIRST + 406; +static const wxEventType wxEVT_ACTIVATE = wxEVT_FIRST + 409; +static const wxEventType wxEVT_CREATE = wxEVT_FIRST + 410; +static const wxEventType wxEVT_DESTROY = wxEVT_FIRST + 411; +static const wxEventType wxEVT_SHOW = wxEVT_FIRST + 412; +static const wxEventType wxEVT_ICONIZE = wxEVT_FIRST + 413; +static const wxEventType wxEVT_MAXIMIZE = wxEVT_FIRST + 414; +static const wxEventType wxEVT_MOUSE_CAPTURE_CHANGED = wxEVT_FIRST + 415; +static const wxEventType wxEVT_PAINT = wxEVT_FIRST + 416; +static const wxEventType wxEVT_ERASE_BACKGROUND = wxEVT_FIRST + 417; +static const wxEventType wxEVT_NC_PAINT = wxEVT_FIRST + 418; +static const wxEventType wxEVT_PAINT_ICON = wxEVT_FIRST + 419; +static const wxEventType wxEVT_MENU_CHAR = wxEVT_FIRST + 420; +static const wxEventType wxEVT_MENU_INIT = wxEVT_FIRST + 421; +static const wxEventType wxEVT_MENU_HIGHLIGHT = wxEVT_FIRST + 422; +static const wxEventType wxEVT_POPUP_MENU_INIT = wxEVT_FIRST + 423; +static const wxEventType wxEVT_CONTEXT_MENU = wxEVT_FIRST + 424; +static const wxEventType wxEVT_SYS_COLOUR_CHANGED = wxEVT_FIRST + 425; +static const wxEventType wxEVT_SETTING_CHANGED = wxEVT_FIRST + 426; +static const wxEventType wxEVT_QUERY_NEW_PALETTE = wxEVT_FIRST + 427; +static const wxEventType wxEVT_PALETTE_CHANGED = wxEVT_FIRST + 428; +static const wxEventType wxEVT_JOY_BUTTON_DOWN = wxEVT_FIRST + 429; +static const wxEventType wxEVT_JOY_BUTTON_UP = wxEVT_FIRST + 430; +static const wxEventType wxEVT_JOY_MOVE = wxEVT_FIRST + 431; +static const wxEventType wxEVT_JOY_ZMOVE = wxEVT_FIRST + 432; +static const wxEventType wxEVT_DROP_FILES = wxEVT_FIRST + 433; +static const wxEventType wxEVT_DRAW_ITEM = wxEVT_FIRST + 434; +static const wxEventType wxEVT_MEASURE_ITEM = wxEVT_FIRST + 435; +static const wxEventType wxEVT_COMPARE_ITEM = wxEVT_FIRST + 436; +static const wxEventType wxEVT_INIT_DIALOG = wxEVT_FIRST + 437; +static const wxEventType wxEVT_IDLE = wxEVT_FIRST + 438; +static const wxEventType wxEVT_UPDATE_UI = wxEVT_FIRST + 439; /* System misc. */ -extern const wxEventType wxEVT_END_PROCESS; +static const wxEventType wxEVT_END_PROCESS = wxEVT_FIRST + 440; /* Dial up events */ -extern const wxEventType wxEVT_DIALUP_CONNECTED; -extern const wxEventType wxEVT_DIALUP_DISCONNECTED; +static const wxEventType wxEVT_DIALUP_CONNECTED = wxEVT_FIRST + 450; +static const wxEventType wxEVT_DIALUP_DISCONNECTED = wxEVT_FIRST + 451; /* Generic command events */ /* Note: a click is a higher-level event than button down/up */ -extern const wxEventType wxEVT_COMMAND_LEFT_CLICK; -extern const wxEventType wxEVT_COMMAND_LEFT_DCLICK; -extern const wxEventType wxEVT_COMMAND_RIGHT_CLICK; -extern const wxEventType wxEVT_COMMAND_RIGHT_DCLICK; -extern const wxEventType wxEVT_COMMAND_SET_FOCUS; -extern const wxEventType wxEVT_COMMAND_KILL_FOCUS; -extern const wxEventType wxEVT_COMMAND_ENTER; +static const wxEventType wxEVT_COMMAND_LEFT_CLICK = wxEVT_FIRST + 500; +static const wxEventType wxEVT_COMMAND_LEFT_DCLICK = wxEVT_FIRST + 501; +static const wxEventType wxEVT_COMMAND_RIGHT_CLICK = wxEVT_FIRST + 502; +static const wxEventType wxEVT_COMMAND_RIGHT_DCLICK = wxEVT_FIRST + 503; +static const wxEventType wxEVT_COMMAND_SET_FOCUS = wxEVT_FIRST + 504; +static const wxEventType wxEVT_COMMAND_KILL_FOCUS = wxEVT_FIRST + 505; +static const wxEventType wxEVT_COMMAND_ENTER = wxEVT_FIRST + 506; /* Tree control event types */ -extern const wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG; -extern const wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG; -extern const wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT; -extern const wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT; -extern const wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM; -extern const wxEventType wxEVT_COMMAND_TREE_GET_INFO; -extern const wxEventType wxEVT_COMMAND_TREE_SET_INFO; -extern const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED; -extern const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING; -extern const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED; -extern const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING; -extern const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED; -extern const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING; -extern const wxEventType wxEVT_COMMAND_TREE_KEY_DOWN; -extern const wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED; -extern const wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK; -extern const wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK; +static const wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG = wxEVT_FIRST + 600; +static const wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxEVT_FIRST + 601; +static const wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxEVT_FIRST + 602; +static const wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxEVT_FIRST + 603; +static const wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM = wxEVT_FIRST + 604; +static const wxEventType wxEVT_COMMAND_TREE_GET_INFO = wxEVT_FIRST + 605; +static const wxEventType wxEVT_COMMAND_TREE_SET_INFO = wxEVT_FIRST + 606; +static const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxEVT_FIRST + 607; +static const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxEVT_FIRST + 608; +static const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxEVT_FIRST + 609; +static const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxEVT_FIRST + 610; +static const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED = wxEVT_FIRST + 611; +static const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING = wxEVT_FIRST + 612; +static const wxEventType wxEVT_COMMAND_TREE_KEY_DOWN = wxEVT_FIRST + 613; +static const wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxEVT_FIRST + 614; +static const wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxEVT_FIRST + 615; +static const wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 616; /* List control event types */ -extern const wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG; -extern const wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG; -extern const wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT; -extern const wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT; -extern const wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM; -extern const wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS; -extern const wxEventType wxEVT_COMMAND_LIST_GET_INFO; -extern const wxEventType wxEVT_COMMAND_LIST_SET_INFO; -extern const wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED; -extern const wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED; -extern const wxEventType wxEVT_COMMAND_LIST_KEY_DOWN; -extern const wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM; -extern const wxEventType wxEVT_COMMAND_LIST_COL_CLICK; -extern const wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK; -extern const wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK; -extern const wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED; +static const wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG = wxEVT_FIRST + 700; +static const wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxEVT_FIRST + 701; +static const wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxEVT_FIRST + 702; +static const wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxEVT_FIRST + 703; +static const wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM = wxEVT_FIRST + 704; +static const wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxEVT_FIRST + 705; +static const wxEventType wxEVT_COMMAND_LIST_GET_INFO = wxEVT_FIRST + 706; +static const wxEventType wxEVT_COMMAND_LIST_SET_INFO = wxEVT_FIRST + 707; +static const wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED = wxEVT_FIRST + 708; +static const wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxEVT_FIRST + 709; +static const wxEventType wxEVT_COMMAND_LIST_KEY_DOWN = wxEVT_FIRST + 710; +static const wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM = wxEVT_FIRST + 711; +static const wxEventType wxEVT_COMMAND_LIST_COL_CLICK = wxEVT_FIRST + 712; +static const wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxEVT_FIRST + 713; +static const wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 714; +static const wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxEVT_FIRST + 715; /* Tab and notebook control event types */ -extern const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED; -extern const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING; - -extern const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED; -extern const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING; +static const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED = wxEVT_FIRST + 800; +static const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING = wxEVT_FIRST + 801; +static const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxEVT_FIRST + 802; +static const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxEVT_FIRST + 803; /* Splitter events */ -extern const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED; -extern const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING; -extern const wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED; -extern const wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT; +static const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxEVT_FIRST + 850; +static const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxEVT_FIRST + 851; +static const wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxEVT_FIRST + 852; +static const wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT = wxEVT_FIRST + 853; /* Wizard events */ -extern const wxEventType wxEVT_WIZARD_PAGE_CHANGED; -extern const wxEventType wxEVT_WIZARD_PAGE_CHANGING; -extern const wxEventType wxEVT_WIZARD_CANCEL; +static const wxEventType wxEVT_WIZARD_PAGE_CHANGED = wxEVT_FIRST + 900; +static const wxEventType wxEVT_WIZARD_PAGE_CHANGING = wxEVT_FIRST + 901; +static const wxEventType wxEVT_WIZARD_CANCEL = wxEVT_FIRST + 902; /* Calendar events */ -extern const wxEventType wxEVT_CALENDAR_SEL_CHANGED; -extern const wxEventType wxEVT_CALENDAR_DAY_CHANGED; -extern const wxEventType wxEVT_CALENDAR_MONTH_CHANGED; -extern const wxEventType wxEVT_CALENDAR_YEAR_CHANGED; -extern const wxEventType wxEVT_CALENDAR_DOUBLECLICKED; -extern const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED; - -extern const wxEventType wxEVT_USER_FIRST; +static const wxEventType wxEVT_CALENDAR_SEL_CHANGED = wxEVT_FIRST + 950; +static const wxEventType wxEVT_CALENDAR_DAY_CHANGED = wxEVT_FIRST + 951; +static const wxEventType wxEVT_CALENDAR_MONTH_CHANGED = wxEVT_FIRST + 952; +static const wxEventType wxEVT_CALENDAR_YEAR_CHANGED = wxEVT_FIRST + 953; +static const wxEventType wxEVT_CALENDAR_DOUBLECLICKED = wxEVT_FIRST + 954; +static const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955; + +static const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000; #else // everybody else diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 7160e8d6ea..b78abcbd06 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -43,10 +43,10 @@ #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 // -// VisualAge C++ V4.0 cannot have any const decs +// VisualAge C++ V4.0 cannot have any external linkage const decs // in headers included by more than one primary source // -extern const off_t wxInvalidOffset; +static const off_t wxInvalidOffset = (off_t)-1; #else const off_t wxInvalidOffset = (off_t)-1; #endif diff --git a/include/wx/string.h b/include/wx/string.h index 5d605f2e76..87219a05a3 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -95,8 +95,8 @@ // ---------------------------------------------------------------------------- #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 -// must define this in .cpp for VA or else you get multiply defined symbols everywhere -extern const unsigned int wxSTRING_MAXLEN; +// must define this static for VA or else you get multiply defined symbols everywhere +static const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100; #else // maximum possible length for a string means "take all string" everywhere diff --git a/src/common/event.cpp b/src/common/event.cpp index 0278a68a42..aa4c5d9172 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -46,227 +46,6 @@ #include "wx/validate.h" #endif // wxUSE_GUI -#if wxUSE_GUI - #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 - // define these here to keep from getting multiply defines externals -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; - -/* 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; - - /* - * 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_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; - -#if defined(__BORLANDC__) && defined(__WIN16__) -/* For 16-bit BC++, these 2 are identical (truncated) */ -const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGED = wxEVT_FIRST + 802; -const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGING = wxEVT_FIRST + 803; -#else -const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxEVT_FIRST + 802; -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; - -/* 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 // VisualAge C++ V4.0 -#endif // wxUSE_GUI // ---------------------------------------------------------------------------- // wxWin macros diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index f8f4989918..cc53efde61 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -110,10 +110,6 @@ // constants // ---------------------------------------------------------------------------- -#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 -const off_t wxInvalidOffset = (off_t)-1; -#endif - #define _MAXPATHLEN 500 extern wxChar *wxBuffer; diff --git a/src/common/string.cpp b/src/common/string.cpp index efe9a4e186..7d44969b8f 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -64,15 +64,6 @@ // NB: EXTRA_ALLOC must be >= 0! #define EXTRA_ALLOC (19 - nLen % 16) -#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 -// must define this in .cpp for VA or else you get multiply defined symbols everywhere - -// maximum possible length for a string means "take all string" everywhere -// (as sizeof(StringData) is unknown here, we substract 100) -const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100; - -#endif - // --------------------------------------------------------------------------- // static class variables definition // --------------------------------------------------------------------------- -- 2.45.2