Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use DECLARE_EVENT_TYPE() to avoid confusing people about its unused value parameter, declare the event type constants directly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-01-27 13:21:39 +00:00
parent d102b02a88
commit c058cafa56
34 changed files with 397 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/aui/auibook.h
View File

@@ -659,23 +659,21 @@ protected:
#ifndef SWIG #ifndef SWIG
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_BUTTON;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_END_DRAG;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 0)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&); typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);

15
include/wx/aui/framemanager.h
View File

@@ -797,16 +797,13 @@ public:
#ifndef SWIG #ifndef SWIG
// wx event machinery
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_AUI const wxEventType wxEVT_AUI_PANE_BUTTON;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_BUTTON, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_AUI_PANE_CLOSE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_CLOSE, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_AUI_PANE_MAXIMIZE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_MAXIMIZE, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_AUI_PANE_RESTORE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_RESTORE, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_AUI_RENDER;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_RENDER, 0) extern WXDLLIMPEXP_AUI const wxEventType wxEVT_AUI_FIND_MANAGER;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_FIND_MANAGER, 0)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&); typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&);

14
include/wx/calctrl.h
View File

@@ -202,14 +202,12 @@ wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type)
// calendar event types and macros for handling them // calendar event types and macros for handling them
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALENDAR_SEL_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALENDAR_SEL_CHANGED, 950) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALENDAR_DAY_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALENDAR_DAY_CHANGED, 951) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALENDAR_MONTH_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALENDAR_MONTH_CHANGED, 952) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALENDAR_YEAR_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALENDAR_YEAR_CHANGED, 953) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALENDAR_DOUBLECLICKED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALENDAR_DOUBLECLICKED, 954) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALENDAR_WEEKDAY_CLICKED, 955)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxCalendarEventFunction)(wxCalendarEvent&); typedef void (wxEvtHandler::*wxCalendarEventFunction)(wxCalendarEvent&);

4
include/wx/clrpicker.h
View File

@@ -160,9 +160,7 @@ private:
// wxColourPickerEvent: used by wxColourPickerCtrl only // wxColourPickerEvent: used by wxColourPickerCtrl only
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_COLOURPICKER_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLOURPICKER_CHANGED, 1102)
END_DECLARE_EVENT_TYPES()
class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
{ {

4
include/wx/collpane.h
View File

@@ -51,9 +51,7 @@ public:
// event types and macros // event types and macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_COLLPANE_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, 1102)
END_DECLARE_EVENT_TYPES()
class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
{ {

52
include/wx/dataview.h
View File

@@ -131,8 +131,8 @@ class WXDLLIMPEXP_ADV wxDataViewItemAttr
{ {
public: public:
// ctors // ctors
wxDataViewItemAttr() wxDataViewItemAttr()
{ {
m_bold = false; m_bold = false;
m_italic = false; m_italic = false;
} }
@@ -141,11 +141,11 @@ public:
void SetColour(const wxColour& colour) { m_colour = colour; } void SetColour(const wxColour& colour) { m_colour = colour; }
void SetBold( bool set ) { m_bold = set; } void SetBold( bool set ) { m_bold = set; }
void SetItalic( bool set ) { m_italic = set; } void SetItalic( bool set ) { m_italic = set; }
// accessors // accessors
bool HasColour() const { return m_colour.Ok(); } bool HasColour() const { return m_colour.Ok(); }
const wxColour& GetColour() const { return m_colour; } const wxColour& GetColour() const { return m_colour; }
bool GetBold() const { return m_bold; } bool GetBold() const { return m_bold; }
bool GetItalic() const { return m_italic; } bool GetItalic() const { return m_italic; }
@@ -198,7 +198,7 @@ public:
{ return false; } { return false; }
virtual size_t GetDragDataSize( const wxDataViewItem &WXUNUSED(item), const wxDataFormat &WXUNUSED(format) ) virtual size_t GetDragDataSize( const wxDataViewItem &WXUNUSED(item), const wxDataFormat &WXUNUSED(format) )
{ return 0; } { return 0; }
virtual bool GetDragData( const wxDataViewItem &WXUNUSED(item), const wxDataFormat &WXUNUSED(format), virtual bool GetDragData( const wxDataViewItem &WXUNUSED(item), const wxDataFormat &WXUNUSED(format),
void* WXUNUSED(data), size_t WXUNUSED(size) ) void* WXUNUSED(data), size_t WXUNUSED(size) )
{ return FALSE; } { return FALSE; }
@@ -222,7 +222,7 @@ public:
virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending ); unsigned int column, bool ascending );
virtual bool HasDefaultCompare() const { return false; } virtual bool HasDefaultCompare() const { return false; }
// internal // internal
virtual bool IsIndexListModel() const { return false; } virtual bool IsIndexListModel() const { return false; }
@@ -251,7 +251,7 @@ public:
virtual bool GetAttr( unsigned int WXUNUSED(row), unsigned int WXUNUSED(col), wxDataViewItemAttr &WXUNUSED(attr) ) virtual bool GetAttr( unsigned int WXUNUSED(row), unsigned int WXUNUSED(col), wxDataViewItemAttr &WXUNUSED(attr) )
{ return false; } { return false; }
void RowPrepended(); void RowPrepended();
void RowInserted( unsigned int before ); void RowInserted( unsigned int before );
void RowAppended(); void RowAppended();
@@ -286,7 +286,7 @@ public:
// internal // internal
virtual bool IsIndexListModel() const { return true; } virtual bool IsIndexListModel() const { return true; }
unsigned int GetLastIndex() const { return m_lastIndex; } unsigned int GetLastIndex() const { return m_lastIndex; }
private: private:
wxDataViewItemArray m_hash; wxDataViewItemArray m_hash;
unsigned int m_lastIndex; unsigned int m_lastIndex;
@@ -723,7 +723,7 @@ public:
// for wxEVT_DATAVIEW_COLUMN_HEADER_CLICKED only // for wxEVT_DATAVIEW_COLUMN_HEADER_CLICKED only
void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; } void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; }
wxDataViewColumn *GetDataViewColumn() const { return m_column; } wxDataViewColumn *GetDataViewColumn() const { return m_column; }
// for wxEVT_DATAVIEW_CONTEXT_MENU only // for wxEVT_DATAVIEW_CONTEXT_MENU only
wxPoint GetPosition() const; wxPoint GetPosition() const;
void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; } void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; }
@@ -742,25 +742,23 @@ private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent) DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)
}; };
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, -1)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, -1)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, -1)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, -1) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
END_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED;
extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED;
typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&); typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
@@ -987,7 +985,7 @@ public:
void SetImageList( wxImageList *imagelist ); void SetImageList( wxImageList *imagelist );
wxImageList* GetImageList() { return m_imageList; } wxImageList* GetImageList() { return m_imageList; }
wxDataViewItem AppendItem( const wxDataViewItem& parent, wxDataViewItem AppendItem( const wxDataViewItem& parent,
const wxString &text, int icon = -1, wxClientData *data = NULL ); const wxString &text, int icon = -1, wxClientData *data = NULL );
wxDataViewItem PrependItem( const wxDataViewItem& parent, wxDataViewItem PrependItem( const wxDataViewItem& parent,

6
include/wx/dateevt.h
View File

@@ -47,9 +47,7 @@ private:
// event types and macros for handling them // event types and macros for handling them
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_DATE_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_DATE_CHANGED, 1101)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&); typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&);
@@ -60,7 +58,7 @@ typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&);
wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn)) wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn))
#ifdef _WX_DEFINE_DATE_EVENTS_ #ifdef _WX_DEFINE_DATE_EVENTS_
DEFINE_EVENT_TYPE(wxEVT_DATE_CHANGED) const wxEventType wxEVT_DATE_CHANGED = wxNewEventType();
IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent)
#endif #endif

6
include/wx/dialup.h
View File

@@ -152,10 +152,8 @@ public:
// wxDialUpManager events // wxDialUpManager events
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DIALUP_CONNECTED;
DECLARE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED, 450) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DIALUP_DISCONNECTED;
DECLARE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED, 451)
END_DECLARE_EVENT_TYPES()
// the event class for the dialup events // the event class for the dialup events
class WXDLLEXPORT wxDialUpEvent : public wxEvent class WXDLLEXPORT wxDialUpEvent : public wxEvent

311
include/wx/event.h
View File

@@ -56,6 +56,8 @@ typedef int wxEventType;
#define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \ #define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
wxEventTableEntry(type, winid, idLast, fn, obj) wxEventTableEntry(type, winid, idLast, fn, obj)
// obsolete event declaration/definition macros, we don't need them any longer
// but we keep them for compatibility as it doesn't cost us anything anyhow
#define BEGIN_DECLARE_EVENT_TYPES() #define BEGIN_DECLARE_EVENT_TYPES()
#define END_DECLARE_EVENT_TYPES() #define END_DECLARE_EVENT_TYPES()
#define DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value) \ #define DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value) \
@@ -70,179 +72,172 @@ typedef int wxEventType;
// generate a new unique event type // generate a new unique event type
extern WXDLLIMPEXP_BASE wxEventType wxNewEventType(); extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
BEGIN_DECLARE_EVENT_TYPES() // many, but not all, standard event types
// it is important to still have these as constants to avoid
// initialization order related problems
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_NULL, 0)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_FIRST, 10000)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_USER_FIRST, wxEVT_FIRST + 2000)
DECLARE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED, 1) // some generic events
DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED, 2) extern WXDLLIMPEXP_BASE const wxEventType wxEVT_NULL;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED, 3) extern WXDLLIMPEXP_BASE const wxEventType wxEVT_FIRST;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_SELECTED, 4) extern WXDLLIMPEXP_BASE const wxEventType wxEVT_USER_FIRST;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 5)
DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 6)
DECLARE_EVENT_TYPE(wxEVT_COMMAND_MENU_SELECTED, 9)
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED, 10)
DECLARE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED, 11)
DECLARE_EVENT_TYPE(wxEVT_COMMAND_RADIOBUTTON_SELECTED, 12)
// wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use // Command events
// wxEVT_SCROLL... events extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_BUTTON_CLICKED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICE_SELECTED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOX_SELECTED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_MENU_SELECTED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SLIDER_UPDATED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SCROLLBAR_UPDATED, 13) // wxEVT_COMMAND_SCROLLBAR_UPDATED is deprecated, use wxEVT_SCROLL... events
DECLARE_EVENT_TYPE(wxEVT_COMMAND_VLBOX_SELECTED, 14) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED, 15) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_VLBOX_SELECTED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED, 16) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER, 17) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOL_RCLICKED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED, 18) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOL_ENTER;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED;
// Toolbar dropdown arrows // Sockets and timers send events, too
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, 19) extern WXDLLIMPEXP_BASE const wxEventType wxEVT_SOCKET;
extern WXDLLIMPEXP_BASE const wxEventType wxEVT_TIMER;
// Sockets and timers send events, too // Mouse event types
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_SOCKET, 50) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_LEFT_DOWN;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_TIMER , 80) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_LEFT_UP;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MIDDLE_DOWN;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MIDDLE_UP;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_RIGHT_DOWN;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_RIGHT_UP;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MOTION;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_ENTER_WINDOW;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_LEAVE_WINDOW;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_LEFT_DCLICK;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MIDDLE_DCLICK;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_RIGHT_DCLICK;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SET_FOCUS;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_KILL_FOCUS;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CHILD_FOCUS;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MOUSEWHEEL;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_AUX1_DOWN;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_AUX1_UP;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_AUX1_DCLICK;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_AUX2_DOWN;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_AUX2_UP;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_AUX2_DCLICK;
// Mouse event types // Non-client mouse events
DECLARE_EVENT_TYPE(wxEVT_LEFT_DOWN, 100) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_LEFT_DOWN;
DECLARE_EVENT_TYPE(wxEVT_LEFT_UP, 101) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_LEFT_UP;
DECLARE_EVENT_TYPE(wxEVT_MIDDLE_DOWN, 102) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_MIDDLE_DOWN;
DECLARE_EVENT_TYPE(wxEVT_MIDDLE_UP, 103) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_MIDDLE_UP;
DECLARE_EVENT_TYPE(wxEVT_RIGHT_DOWN, 104) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_RIGHT_DOWN;
DECLARE_EVENT_TYPE(wxEVT_RIGHT_UP, 105) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_RIGHT_UP;
DECLARE_EVENT_TYPE(wxEVT_MOTION, 106) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_MOTION;
DECLARE_EVENT_TYPE(wxEVT_ENTER_WINDOW, 107) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_ENTER_WINDOW;
DECLARE_EVENT_TYPE(wxEVT_LEAVE_WINDOW, 108) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_LEAVE_WINDOW;
DECLARE_EVENT_TYPE(wxEVT_LEFT_DCLICK, 109) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_LEFT_DCLICK;
DECLARE_EVENT_TYPE(wxEVT_MIDDLE_DCLICK, 110) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_MIDDLE_DCLICK;
DECLARE_EVENT_TYPE(wxEVT_RIGHT_DCLICK, 111) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_RIGHT_DCLICK;
DECLARE_EVENT_TYPE(wxEVT_SET_FOCUS, 112)
DECLARE_EVENT_TYPE(wxEVT_KILL_FOCUS, 113)
DECLARE_EVENT_TYPE(wxEVT_CHILD_FOCUS, 114)
DECLARE_EVENT_TYPE(wxEVT_MOUSEWHEEL, 115)
DECLARE_EVENT_TYPE(wxEVT_AUX1_DOWN, 116)
DECLARE_EVENT_TYPE(wxEVT_AUX1_UP, 117)
DECLARE_EVENT_TYPE(wxEVT_AUX1_DCLICK, 118)
DECLARE_EVENT_TYPE(wxEVT_AUX2_DOWN, 119)
DECLARE_EVENT_TYPE(wxEVT_AUX2_UP, 120)
DECLARE_EVENT_TYPE(wxEVT_AUX2_DCLICK, 121)
// Non-client mouse events // Character input event type
DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN, 200) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CHAR;
DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_UP, 201) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CHAR_HOOK;
DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_DOWN, 202) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NAVIGATION_KEY;
DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_UP, 203) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_KEY_DOWN;
DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_DOWN, 204) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_KEY_UP;
DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_UP, 205)
DECLARE_EVENT_TYPE(wxEVT_NC_MOTION, 206)
DECLARE_EVENT_TYPE(wxEVT_NC_ENTER_WINDOW, 207)
DECLARE_EVENT_TYPE(wxEVT_NC_LEAVE_WINDOW, 208)
DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_DCLICK, 209)
DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_DCLICK, 210)
DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_DCLICK, 211)
// Character input event type
DECLARE_EVENT_TYPE(wxEVT_CHAR, 212)
DECLARE_EVENT_TYPE(wxEVT_CHAR_HOOK, 213)
DECLARE_EVENT_TYPE(wxEVT_NAVIGATION_KEY, 214)
DECLARE_EVENT_TYPE(wxEVT_KEY_DOWN, 215)
DECLARE_EVENT_TYPE(wxEVT_KEY_UP, 216)
#if wxUSE_HOTKEY #if wxUSE_HOTKEY
DECLARE_EVENT_TYPE(wxEVT_HOTKEY, 217) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_HOTKEY;
#endif #endif
// Set cursor event // Set cursor event
DECLARE_EVENT_TYPE(wxEVT_SET_CURSOR, 230) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SET_CURSOR;
// wxScrollBar and wxSlider event identifiers // wxScrollBar and wxSlider event identifiers
DECLARE_EVENT_TYPE(wxEVT_SCROLL_TOP, 300) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_TOP;
DECLARE_EVENT_TYPE(wxEVT_SCROLL_BOTTOM, 301) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_BOTTOM;
DECLARE_EVENT_TYPE(wxEVT_SCROLL_LINEUP, 302) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_LINEUP;
DECLARE_EVENT_TYPE(wxEVT_SCROLL_LINEDOWN, 303) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_LINEDOWN;
DECLARE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP, 304) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_PAGEUP;
DECLARE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN, 305) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_PAGEDOWN;
DECLARE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK, 306) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_THUMBTRACK;
DECLARE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE, 307) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_THUMBRELEASE;
DECLARE_EVENT_TYPE(wxEVT_SCROLL_CHANGED, 308) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_CHANGED;
// Scroll events from wxWindow // Scroll events from wxWindow
DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP, 320) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLLWIN_TOP;
DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM, 321) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLLWIN_BOTTOM;
DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEUP, 322) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLLWIN_LINEUP;
DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEDOWN, 323) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLLWIN_LINEDOWN;
DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEUP, 324) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLLWIN_PAGEUP;
DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEDOWN, 325) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLLWIN_PAGEDOWN;
DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBTRACK, 326) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLLWIN_THUMBTRACK;
DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE, 327) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLLWIN_THUMBRELEASE;
// System events // System events
DECLARE_EVENT_TYPE(wxEVT_SIZE, 400) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SIZE;
DECLARE_EVENT_TYPE(wxEVT_MOVE, 401) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MOVE;
DECLARE_EVENT_TYPE(wxEVT_CLOSE_WINDOW, 402) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CLOSE_WINDOW;
DECLARE_EVENT_TYPE(wxEVT_END_SESSION, 403) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_END_SESSION;
DECLARE_EVENT_TYPE(wxEVT_QUERY_END_SESSION, 404) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_QUERY_END_SESSION;
DECLARE_EVENT_TYPE(wxEVT_ACTIVATE_APP, 405) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_ACTIVATE_APP;
// 406..408 are power events extern WXDLLIMPEXP_CORE const wxEventType wxEVT_ACTIVATE;
DECLARE_EVENT_TYPE(wxEVT_ACTIVATE, 409) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CREATE;
DECLARE_EVENT_TYPE(wxEVT_CREATE, 410) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DESTROY;
DECLARE_EVENT_TYPE(wxEVT_DESTROY, 411) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SHOW;
DECLARE_EVENT_TYPE(wxEVT_SHOW, 412) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_ICONIZE;
DECLARE_EVENT_TYPE(wxEVT_ICONIZE, 413) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MAXIMIZE;
DECLARE_EVENT_TYPE(wxEVT_MAXIMIZE, 414) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MOUSE_CAPTURE_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_CHANGED, 415) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MOUSE_CAPTURE_LOST;
DECLARE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_LOST, 416) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_PAINT;
DECLARE_EVENT_TYPE(wxEVT_PAINT, 417) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_ERASE_BACKGROUND;
DECLARE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND, 418) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_NC_PAINT;
DECLARE_EVENT_TYPE(wxEVT_NC_PAINT, 419) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_PAINT_ICON;
DECLARE_EVENT_TYPE(wxEVT_PAINT_ICON, 420) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MENU_OPEN;
DECLARE_EVENT_TYPE(wxEVT_MENU_OPEN, 421) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MENU_CLOSE;
DECLARE_EVENT_TYPE(wxEVT_MENU_CLOSE, 422) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MENU_HIGHLIGHT;
DECLARE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT, 423) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CONTEXT_MENU;
DECLARE_EVENT_TYPE(wxEVT_CONTEXT_MENU, 424) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SYS_COLOUR_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED, 425) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DISPLAY_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_DISPLAY_CHANGED, 426) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SETTING_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_SETTING_CHANGED, 427) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_QUERY_NEW_PALETTE;
DECLARE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE, 428) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_PALETTE_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_PALETTE_CHANGED, 429) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_JOY_BUTTON_DOWN;
DECLARE_EVENT_TYPE(wxEVT_JOY_BUTTON_DOWN, 430) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_JOY_BUTTON_UP;
DECLARE_EVENT_TYPE(wxEVT_JOY_BUTTON_UP, 431) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_JOY_MOVE;
DECLARE_EVENT_TYPE(wxEVT_JOY_MOVE, 432) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_JOY_ZMOVE;
DECLARE_EVENT_TYPE(wxEVT_JOY_ZMOVE, 433) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DROP_FILES;
DECLARE_EVENT_TYPE(wxEVT_DROP_FILES, 434) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DRAW_ITEM;
DECLARE_EVENT_TYPE(wxEVT_DRAW_ITEM, 435) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MEASURE_ITEM;
DECLARE_EVENT_TYPE(wxEVT_MEASURE_ITEM, 436) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMPARE_ITEM;
DECLARE_EVENT_TYPE(wxEVT_COMPARE_ITEM, 437) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_INIT_DIALOG;
DECLARE_EVENT_TYPE(wxEVT_INIT_DIALOG, 438) extern WXDLLIMPEXP_BASE const wxEventType wxEVT_IDLE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_IDLE, 439) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_UPDATE_UI;
DECLARE_EVENT_TYPE(wxEVT_UPDATE_UI, 440) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SIZING;
DECLARE_EVENT_TYPE(wxEVT_SIZING, 441) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MOVING;
DECLARE_EVENT_TYPE(wxEVT_MOVING, 442) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MOVE_START;
DECLARE_EVENT_TYPE(wxEVT_MOVE_START, 443) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_MOVE_END;
DECLARE_EVENT_TYPE(wxEVT_MOVE_END, 444) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_HIBERNATE;
DECLARE_EVENT_TYPE(wxEVT_HIBERNATE, 445)
// more power events follow -- see wx/power.h
// Clipboard events // Clipboard events
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_COPY, 446) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_COPY;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_CUT, 447) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_CUT;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_PASTE, 448) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_PASTE;
// Generic command events // Generic command events
// Note: a click is a higher-level event than button down/up // Note: a click is a higher-level event than button down/up
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LEFT_CLICK, 500) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LEFT_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LEFT_DCLICK, 501) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LEFT_DCLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_CLICK, 502) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_RIGHT_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_DCLICK, 503) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_RIGHT_DCLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SET_FOCUS, 504) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SET_FOCUS;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_KILL_FOCUS, 505) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_KILL_FOCUS;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_ENTER, 506) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_ENTER;
// Help events // Help events
DECLARE_EVENT_TYPE(wxEVT_HELP, 1050) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_HELP;
DECLARE_EVENT_TYPE(wxEVT_DETAILED_HELP, 1051) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DETAILED_HELP;
END_DECLARE_EVENT_TYPES()
// these 2 events are the same // these 2 events are the same
#define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED #define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED

12
include/wx/fdrepdlg.h
View File

@@ -161,13 +161,11 @@ private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent) DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent)
}; };
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND, 510) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND_NEXT;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT, 511) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND_REPLACE;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE, 512) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND_REPLACE_ALL;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE_ALL, 513) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FIND_CLOSE;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE, 514)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&); typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);

8
include/wx/filectrl.h
View File

@@ -31,11 +31,9 @@ enum
#define wxFC_DEFAULT_STYLE wxFC_OPEN #define wxFC_DEFAULT_STYLE wxFC_OPEN
extern WXDLLEXPORT_DATA( const wxChar ) wxFileCtrlNameStr[]; extern WXDLLEXPORT_DATA( const wxChar ) wxFileCtrlNameStr[];
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_SELECTIONCHANGED;
DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_SELECTIONCHANGED, 1150 ) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FILEACTIVATED;
DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FILEACTIVATED, 1151 ) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FOLDERCHANGED;
DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FOLDERCHANGED, 1152 )
END_DECLARE_EVENT_TYPES()
class WXDLLIMPEXP_CORE wxFileCtrlBase class WXDLLIMPEXP_CORE wxFileCtrlBase
{ {

6
include/wx/filepicker.h
View File

@@ -361,10 +361,8 @@ private:
// wxFileDirPickerEvent: used by wxFilePickerCtrl and wxDirPickerCtrl only // wxFileDirPickerEvent: used by wxFilePickerCtrl and wxDirPickerCtrl only
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FILEPICKER_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_FILEPICKER_CHANGED, 1102) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_DIRPICKER_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_DIRPICKER_CHANGED, 1103)
END_DECLARE_EVENT_TYPES()
class WXDLLIMPEXP_CORE wxFileDirPickerEvent : public wxCommandEvent class WXDLLIMPEXP_CORE wxFileDirPickerEvent : public wxCommandEvent
{ {

4
include/wx/fontpicker.h
View File

@@ -180,9 +180,7 @@ private:
// wxFontPickerEvent: used by wxFontPickerCtrl only // wxFontPickerEvent: used by wxFontPickerCtrl only
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_FONTPICKER_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_FONTPICKER_CHANGED, 1102)
END_DECLARE_EVENT_TYPES()
class WXDLLIMPEXP_CORE wxFontPickerEvent : public wxCommandEvent class WXDLLIMPEXP_CORE wxFontPickerEvent : public wxCommandEvent
{ {

38
include/wx/generic/grid.h
View File

@@ -2256,26 +2256,24 @@ private:
}; };
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_CELL_LEFT_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_CLICK, 1580) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_CELL_RIGHT_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_CLICK, 1581) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_CELL_LEFT_DCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_DCLICK, 1582) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_CELL_RIGHT_DCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_DCLICK, 1583) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_LABEL_LEFT_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_CLICK, 1584) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_LABEL_RIGHT_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_CLICK, 1585) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_LABEL_LEFT_DCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_DCLICK, 1586) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_LABEL_RIGHT_DCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_DCLICK, 1587) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_ROW_SIZE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_ROW_SIZE, 1588) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_COL_SIZE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SIZE, 1589) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_RANGE_SELECT;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_RANGE_SELECT, 1590) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_CELL_CHANGE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGE, 1591) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_SELECT_CELL;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_SELECT_CELL, 1592) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_EDITOR_SHOWN;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_SHOWN, 1593) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_EDITOR_HIDDEN;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_HIDDEN, 1594) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_EDITOR_CREATED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_CREATED, 1595) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_CELL_BEGIN_DRAG;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_BEGIN_DRAG, 1596) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_GRID_COL_MOVE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_COL_MOVE, 1597)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&); typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&);

6
include/wx/generic/laywin.h
View File

@@ -21,10 +21,8 @@
#include "wx/event.h" #include "wx/event.h"
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_QUERY_LAYOUT_INFO;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, 1500) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_CALCULATE_LAYOUT;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT, 1501)
END_DECLARE_EVENT_TYPES()
enum wxLayoutOrientation enum wxLayoutOrientation
{ {

5
include/wx/generic/sashwin.h
View File

@@ -203,10 +203,7 @@ private:
DECLARE_NO_COPY_CLASS(wxSashWindow) DECLARE_NO_COPY_CLASS(wxSashWindow)
}; };
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_SASH_DRAGGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,
wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200)
END_DECLARE_EVENT_TYPES()
enum wxSashDragStatus enum wxSashDragStatus
{ {

13
include/wx/html/htmlwin.h
View File

@@ -550,16 +550,9 @@ private:
}; };
extern WXDLLIMPEXP_HTML const wxEventType wxEVT_COMMAND_HTML_CELL_CLICKED;
extern WXDLLIMPEXP_HTML const wxEventType wxEVT_COMMAND_HTML_CELL_HOVER;
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_HTML const wxEventType wxEVT_COMMAND_HTML_LINK_CLICKED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_HTML,
wxEVT_COMMAND_HTML_CELL_CLICKED, 1000)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_HTML,
wxEVT_COMMAND_HTML_CELL_HOVER, 1001)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_HTML,
wxEVT_COMMAND_HTML_LINK_CLICKED, 1002)
END_DECLARE_EVENT_TYPES()
/*! /*!

28
include/wx/html/webkit.h
View File

@@ -63,25 +63,25 @@ public:
wxString GetPageURL(){ return m_currentURL; } wxString GetPageURL(){ return m_currentURL; }
void SetPageTitle(const wxString& title) { m_pageTitle = title; } void SetPageTitle(const wxString& title) { m_pageTitle = title; }
wxString GetPageTitle(){ return m_pageTitle; } wxString GetPageTitle(){ return m_pageTitle; }
// since these worked in 2.6, add wrappers // since these worked in 2.6, add wrappers
void SetTitle(const wxString& title) { SetPageTitle(title); } void SetTitle(const wxString& title) { SetPageTitle(title); }
wxString GetTitle() { return GetPageTitle(); } wxString GetTitle() { return GetPageTitle(); }
wxString GetSelection(); wxString GetSelection();
bool CanIncreaseTextSize(); bool CanIncreaseTextSize();
void IncreaseTextSize(); void IncreaseTextSize();
bool CanDecreaseTextSize(); bool CanDecreaseTextSize();
void DecreaseTextSize(); void DecreaseTextSize();
void Print(bool showPrompt=FALSE); void Print(bool showPrompt=FALSE);
void MakeEditable(bool enable=TRUE); void MakeEditable(bool enable=TRUE);
bool IsEditable(); bool IsEditable();
wxString RunScript(const wxString& javascript); wxString RunScript(const wxString& javascript);
void SetScrollPos(int pos); void SetScrollPos(int pos);
int GetScrollPos(); int GetScrollPos();
@@ -98,9 +98,9 @@ private:
wxWindowID m_windowID; wxWindowID m_windowID;
wxString m_currentURL; wxString m_currentURL;
wxString m_pageTitle; wxString m_pageTitle;
struct objc_object *m_webView; struct objc_object *m_webView;
// we may use this later to setup our own mouse events, // we may use this later to setup our own mouse events,
// so leave it in for now. // so leave it in for now.
void* m_webKitCtrlEventHandler; void* m_webKitCtrlEventHandler;
@@ -136,7 +136,7 @@ enum {
class wxWebKitBeforeLoadEvent : public wxCommandEvent class wxWebKitBeforeLoadEvent : public wxCommandEvent
{ {
DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent ) DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
public: public:
bool IsCancelled() { return m_cancelled; } bool IsCancelled() { return m_cancelled; }
void Cancel(bool cancel = true) { m_cancelled = cancel; } void Cancel(bool cancel = true) { m_cancelled = cancel; }
@@ -175,10 +175,8 @@ protected:
typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&); typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);
typedef void (wxEvtHandler::*wxWebKitBeforeLoadEventFunction)(wxWebKitBeforeLoadEvent&); typedef void (wxEvtHandler::*wxWebKitBeforeLoadEventFunction)(wxWebKitBeforeLoadEvent&);
BEGIN_DECLARE_EVENT_TYPES() extern const wxEventType wxEVT_WEBKIT_BEFORE_LOAD;
DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_BEFORE_LOAD, wxID_ANY) extern const wxEventType wxEVT_WEBKIT_STATE_CHANGED;
DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_STATE_CHANGED, wxID_ANY)
END_DECLARE_EVENT_TYPES()
#define EVT_WEBKIT_STATE_CHANGED(func) \ #define EVT_WEBKIT_STATE_CHANGED(func) \
DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \
@@ -187,7 +185,7 @@ END_DECLARE_EVENT_TYPES()
(wxObjectEventFunction) \ (wxObjectEventFunction) \
(wxWebKitStateChangedEventFunction) & func, \ (wxWebKitStateChangedEventFunction) & func, \
(wxObject *) NULL ), (wxObject *) NULL ),
#define EVT_WEBKIT_BEFORE_LOAD(func) \ #define EVT_WEBKIT_BEFORE_LOAD(func) \
DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \
wxID_ANY, \ wxID_ANY, \

7
include/wx/hyperlink.h
View File

@@ -88,10 +88,7 @@ inline void wxHyperlinkCtrlBase::CheckParams(const wxString&, const wxString&, l
// wxHyperlinkEvent // wxHyperlinkEvent
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Declare an event identifier. extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_HYPERLINK;
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_HYPERLINK, 3700)
END_DECLARE_EVENT_TYPES()
// //
// An event fired when the user clicks on the label in a hyperlink control. // An event fired when the user clicks on the label in a hyperlink control.
@@ -138,7 +135,7 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
wx__DECLARE_EVT1(wxEVT_COMMAND_HYPERLINK, id, wxHyperlinkEventHandler(fn)) wx__DECLARE_EVT1(wxEVT_COMMAND_HYPERLINK, id, wxHyperlinkEventHandler(fn))
#ifdef _WX_DEFINE_DATE_EVENTS_ #ifdef _WX_DEFINE_DATE_EVENTS_
DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK) const wxEventType wxEVT_COMMAND_HYPERLINK = wxNewEventType();
IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
#endif #endif

42
include/wx/listbase.h
View File

@@ -422,29 +422,27 @@ private:
// wxListCtrl event macros // wxListCtrl event macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG, 700) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG, 701) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 702) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT, 703) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM, 704) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 705)
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED, 708) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED, 709) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN, 710) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_KEY_DOWN;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM, 711) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK, 712) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_COL_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 713) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 714) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 715) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT, 716) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_CACHE_HINT;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 717) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 718) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_COL_BEGIN_DRAG;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING, 719) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_COL_DRAGGING;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG, 720) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_COL_END_DRAG;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED, 721) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LIST_ITEM_FOCUSED;
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&); typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);

22
include/wx/mediactrl.h
View File

@@ -326,13 +326,9 @@ public:
}; };
//Event ID to give to our events //Our events
#define wxMEDIA_FINISHED_ID 13000 extern WXDLLIMPEXP_MEDIA const wxEventType wxEVT_MEDIA_FINISHED;
#define wxMEDIA_STOP_ID 13001 extern WXDLLIMPEXP_MEDIA const wxEventType wxEVT_MEDIA_STOP;
//Define our event types - we need to call DEFINE_EVENT_TYPE(EVT) later
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_STOP, wxMEDIA_STOP_ID)
//Function type(s) our events need //Function type(s) our events need
typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&); typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&);
@@ -344,16 +340,12 @@ typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&);
#define EVT_MEDIA_FINISHED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_FINISHED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_FINISHED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_FINISHED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#define EVT_MEDIA_STOP(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STOP, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_STOP(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STOP, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#define wxMEDIA_LOADED_ID 13002 extern WXDLLIMPEXP_MEDIA const wxEventType wxEVT_MEDIA_LOADED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_LOADED, wxMEDIA_LOADED_ID)
#define EVT_MEDIA_LOADED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_LOADED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_LOADED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_LOADED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#define wxMEDIA_STATECHANGED_ID 13003 extern WXDLLIMPEXP_MEDIA const wxEventType wxEVT_MEDIA_STATECHANGED;
#define wxMEDIA_PLAY_ID 13004 extern WXDLLIMPEXP_MEDIA const wxEventType wxEVT_MEDIA_PLAY;
#define wxMEDIA_PAUSE_ID 13005 extern WXDLLIMPEXP_MEDIA const wxEventType wxEVT_MEDIA_PAUSE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_STATECHANGED, wxMEDIA_STATECHANGED_ID)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_PLAY, wxMEDIA_PLAY_ID)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_PAUSE, wxMEDIA_PAUSE_ID)
#define EVT_MEDIA_STATECHANGED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STATECHANGED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_STATECHANGED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STATECHANGED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#define EVT_MEDIA_PLAY(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PLAY, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_PLAY(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PLAY, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#define EVT_MEDIA_PAUSE(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PAUSE, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_PAUSE(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PAUSE, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),

6
include/wx/notebook.h
View File

@@ -138,10 +138,8 @@ private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotebookEvent) DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotebookEvent)
}; };
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 802) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 803)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);

10
include/wx/power.h
View File

@@ -70,12 +70,10 @@ private:
DECLARE_ABSTRACT_CLASS(wxPowerEvent) DECLARE_ABSTRACT_CLASS(wxPowerEvent)
}; };
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_BASE const wxEventType wxEVT_POWER_SUSPENDING;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDING, 406) extern WXDLLIMPEXP_BASE const wxEventType wxEVT_POWER_SUSPENDED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDED, 407) extern WXDLLIMPEXP_BASE const wxEventType wxEVT_POWER_SUSPEND_CANCEL;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPEND_CANCEL, 408) extern WXDLLIMPEXP_BASE const wxEventType wxEVT_POWER_RESUME;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_RESUME, 444)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxPowerEventFunction)(wxPowerEvent&); typedef void (wxEvtHandler::*wxPowerEventFunction)(wxPowerEvent&);

4
include/wx/process.h
View File

@@ -130,9 +130,7 @@ protected:
// wxProcess events // wxProcess events
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_BASE const wxEventType wxEVT_END_PROCESS;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, 440)
END_DECLARE_EVENT_TYPES()
class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
{ {

35
include/wx/richtext/richtextctrl.h
View File

@@ -875,28 +875,25 @@ private:
}; };
/*! /*!
* wxRichTextCtrl event macros * wxRichTextCtrl events
*/ */
extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_LEFT_CLICK;
extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK;
extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK;
extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK;
extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_RETURN;
extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_CHARACTER;
extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_DELETE;
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, 2602) extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, 2603) extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, 2604) extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, 2605)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_RETURN, 2606)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_CHARACTER, 2607)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_DELETE, 2608)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, 2609) extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, 2610) extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, 2611) extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, 2612) extern WXDLLIMPEXP_RICHTEXT const wxEventType wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, 2613)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, 2614)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, 2615)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_RICHTEXT, wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, 2616)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxRichTextEventFunction)(wxRichTextEvent&); typedef void (wxEvtHandler::*wxRichTextEventFunction)(wxRichTextEvent&);

13
include/wx/splitter.h
View File

@@ -34,14 +34,11 @@
#define wxSP_FULLSASH 0 #define wxSP_FULLSASH 0
#endif // WXWIN_COMPATIBILITY_2_6 #endif // WXWIN_COMPATIBILITY_2_6
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 850) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 851) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 852) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT, 853)
END_DECLARE_EVENT_TYPES()
#include "wx/generic/splitter.h" #include "wx/generic/splitter.h"
#endif #endif // _WX_SPLITTER_H_BASE_
// _WX_SPLITTER_H_BASE_

6
include/wx/srchctrl.h
View File

@@ -38,10 +38,8 @@
extern WXDLLEXPORT_DATA(const char) wxSearchCtrlNameStr[]; extern WXDLLEXPORT_DATA(const char) wxSearchCtrlNameStr[];
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1120)
END_DECLARE_EVENT_TYPES()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// a search ctrl is a text control with a search button and a cancel button // a search ctrl is a text control with a search button and a cancel button

70
include/wx/stc/stc.h
View File

@@ -2575,7 +2575,7 @@ public:
int startPos, int startPos,
int endPos, int endPos,
wxDC* draw, wxDC* draw,
wxDC* target, wxDC* target,
wxRect renderRect, wxRect renderRect,
wxRect pageRect); wxRect pageRect);
@@ -3525,7 +3525,7 @@ public:
// Set the font encoding to be used by a style. // Set the font encoding to be used by a style.
void StyleSetFontEncoding(int style, wxFontEncoding encoding); void StyleSetFontEncoding(int style, wxFontEncoding encoding);
// Perform one of the operations defined by the wxSTC_CMD_* constants. // Perform one of the operations defined by the wxSTC_CMD_* constants.
void CmdKeyExecute(int cmd); void CmdKeyExecute(int cmd);
@@ -3592,13 +3592,13 @@ public:
bool GetUseAntiAliasing(); bool GetUseAntiAliasing();
// The following methods are nearly equivallent to their similarly named // The following methods are nearly equivallent to their similarly named
// cousins above. The difference is that these methods bypass wxString // cousins above. The difference is that these methods bypass wxString
// and always use a char* even if used in a unicode build of wxWidgets. // and always use a char* even if used in a unicode build of wxWidgets.
// In that case the character data will be utf-8 encoded since that is // In that case the character data will be utf-8 encoded since that is
// what is used internally by Scintilla in unicode builds. // what is used internally by Scintilla in unicode builds.
// Add text to the document at current position. // Add text to the document at current position.
void AddTextRaw(const char* text); void AddTextRaw(const char* text);
@@ -3785,36 +3785,34 @@ private:
#ifndef SWIG #ifndef SWIG
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_CHANGE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CHANGE, 1650) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_STYLENEEDED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_STYLENEEDED, 1651) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_CHARADDED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CHARADDED, 1652) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_SAVEPOINTREACHED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTREACHED, 1653) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_SAVEPOINTLEFT;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTLEFT, 1654) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_ROMODIFYATTEMPT;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_ROMODIFYATTEMPT, 1655) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_KEY;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_KEY, 1656) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DOUBLECLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DOUBLECLICK, 1657) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_UPDATEUI;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_UPDATEUI, 1658) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_MODIFIED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MODIFIED, 1659) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_MACRORECORD;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MACRORECORD, 1660) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_MARGINCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MARGINCLICK, 1661) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_NEEDSHOWN;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_NEEDSHOWN, 1662) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_PAINTED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_PAINTED, 1664) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_USERLISTSELECTION;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_USERLISTSELECTION, 1665) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_URIDROPPED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_URIDROPPED, 1666) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DWELLSTART;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DWELLSTART, 1667) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DWELLEND;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DWELLEND, 1668) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_START_DRAG;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_START_DRAG, 1669) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DRAG_OVER;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DRAG_OVER, 1670) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DO_DROP;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DO_DROP, 1671) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_ZOOM;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_ZOOM, 1672) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_HOTSPOT_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_CLICK, 1673) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_HOTSPOT_DCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_DCLICK, 1674) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_CALLTIP_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CALLTIP_CLICK, 1675) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_AUTOCOMP_SELECTION;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_SELECTION, 1676) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_INDICATOR_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_CLICK, 1677) extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_INDICATOR_RELEASE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_RELEASE, 1678)
END_DECLARE_EVENT_TYPES()
#else #else
enum { enum {
wxEVT_STC_CHANGE, wxEVT_STC_CHANGE,
@@ -3877,10 +3875,10 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
#define EVT_STC_ZOOM(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ), #define EVT_STC_ZOOM(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
#define EVT_STC_HOTSPOT_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ), #define EVT_STC_HOTSPOT_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
#define EVT_STC_HOTSPOT_DCLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ), #define EVT_STC_HOTSPOT_DCLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
#define EVT_STC_CALLTIP_CLICK(id, fn)) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ), #define EVT_STC_CALLTIP_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
#define EVT_STC_AUTOCOMP_SELECTION(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ), #define EVT_STC_AUTOCOMP_SELECTION(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
#define EVT_STC_INDICATOR_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_CLICK id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ), #define EVT_STC_INDICATOR_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_CLICK id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
#define EVT_STC_INDICATOR_RELEASE(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_RELEASE id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ), #define EVT_STC_INDICATOR_RELEASE(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_RELEASE id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
#endif #endif

10
include/wx/tabctrl.h
View File

@@ -16,10 +16,8 @@
#if wxUSE_TAB_DIALOG #if wxUSE_TAB_DIALOG
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGED, 800) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGING, 801)
END_DECLARE_EVENT_TYPES()
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/tabctrl.h" #include "wx/msw/tabctrl.h"
@@ -30,5 +28,5 @@ END_DECLARE_EVENT_TYPES()
#endif #endif
#endif // wxUSE_TAB_DIALOG #endif // wxUSE_TAB_DIALOG
#endif
// _WX_TABCTRL_H_BASE_ #endif // _WX_TABCTRL_H_BASE_

22
include/wx/taskbar.h
View File

@@ -61,7 +61,7 @@ private:
#include "wx/msw/taskbar.h" #include "wx/msw/taskbar.h"
#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
#include "wx/unix/taskbarx11.h" #include "wx/unix/taskbarx11.h"
#elif defined (__WXMAC__) #elif defined (__WXMAC__)
#include "wx/mac/taskbarosx.h" #include "wx/mac/taskbarosx.h"
#elif defined (__WXCOCOA__) #elif defined (__WXCOCOA__)
#include "wx/cocoa/taskbar.h" #include "wx/cocoa/taskbar.h"
@@ -88,17 +88,15 @@ private:
typedef void (wxEvtHandler::*wxTaskBarIconEventFunction)(wxTaskBarIconEvent&); typedef void (wxEvtHandler::*wxTaskBarIconEventFunction)(wxTaskBarIconEvent&);
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_MOVE;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_MOVE,1550) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_LEFT_DOWN;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_DOWN,1551) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_LEFT_UP;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_UP,1552) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_RIGHT_DOWN;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_DOWN,1553) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_RIGHT_UP;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_UP,1554) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_LEFT_DCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_DCLICK,1555) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_RIGHT_DCLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_DCLICK,1556) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_BALLOON_TIMEOUT;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_BALLOON_TIMEOUT,1557) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_BALLOON_CLICK;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_BALLOON_CLICK,1558)
END_DECLARE_EVENT_TYPES()
#define wxTaskBarIconEventHandler(func) \ #define wxTaskBarIconEventHandler(func) \
(wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTaskBarIconEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTaskBarIconEventFunction, &func)

10
include/wx/textctrl.h
View File

@@ -703,12 +703,10 @@ protected:
// wxTextCtrl events // wxTextCtrl events
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_UPDATED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED, 7) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_ENTER;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER, 8) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_URL;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL, 13) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_MAXLEN;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN, 14)
END_DECLARE_EVENT_TYPES()
class WXDLLEXPORT wxTextUrlEvent : public wxCommandEvent class WXDLLEXPORT wxTextUrlEvent : public wxCommandEvent
{ {

4
include/wx/tglbtn.h
View File

@@ -20,9 +20,7 @@
#include "wx/event.h" #include "wx/event.h"
#include "wx/control.h" // base class #include "wx/control.h" // base class
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOGGLEBUTTON_CLICKED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 19)
END_DECLARE_EVENT_TYPES()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxToggleButtonBase // wxToggleButtonBase

44
include/wx/treebase.h
View File

@@ -330,29 +330,27 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
// tree control events and macros for handling them // tree control events and macros for handling them
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_DRAG, 600) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_RDRAG, 601) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 602) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_END_LABEL_EDIT, 603) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_DELETE_ITEM, 604) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_GET_INFO;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_GET_INFO, 605) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_SET_INFO;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_SET_INFO, 606) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_EXPANDED, 607) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_EXPANDING, 608) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 609) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 610) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_SEL_CHANGED, 611) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_SEL_CHANGING, 612) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_KEY_DOWN;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_KEY_DOWN, 613) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 614) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 615) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 616) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_END_DRAG;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_END_DRAG, 617) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 618) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 619) extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREE_ITEM_MENU;
DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_MENU, 620)
END_DECLARE_EVENT_TYPES()
#define wxTreeEventHandler(func) \ #define wxTreeEventHandler(func) \
(wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTreeEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTreeEventFunction, &func)

12
include/wx/wizard.h
View File

@@ -284,13 +284,11 @@ private:
// macros for handling wxWizardEvents // macros for handling wxWizardEvents
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() extern WXDLLIMPEXP_ADV const wxEventType wxEVT_WIZARD_PAGE_CHANGED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_CHANGED, 900) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_WIZARD_PAGE_CHANGING;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_CHANGING, 901) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_WIZARD_CANCEL;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_WIZARD_CANCEL, 902) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_WIZARD_HELP;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_WIZARD_HELP, 903) extern WXDLLIMPEXP_ADV const wxEventType wxEVT_WIZARD_FINISHED;
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_WIZARD_FINISHED, 903)
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&); typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&);