From ff3fd98a080f92ed9123d938d0eb26997cae5bea Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 14 Apr 2009 12:47:46 +0000 Subject: [PATCH] remove semicolon from wxDECLARE_EVENT; having it there was inconsistent with other wxXXX_EVENT macros and generally unexpected git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 4 ++-- interface/wx/event.h | 8 ++++++++ src/unix/sound_sdl.cpp | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/wx/event.h b/include/wx/event.h index cc363146e4..7898489b97 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -124,7 +124,7 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType(); // Declare a local (not exported) wxEventType-based event type: #define wxDECLARE_EVENT( name, type ) \ - wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ); + wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) #else // Define/Declare a templatized event type with the corresponding event as @@ -149,7 +149,7 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType(); // Declare a local (not exported) templatized event type: #define wxDECLARE_EVENT( name, type ) \ - wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ); + wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) #endif diff --git a/interface/wx/event.h b/interface/wx/event.h index 37732d5346..9f061f5a0c 100644 --- a/interface/wx/event.h +++ b/interface/wx/event.h @@ -3823,6 +3823,14 @@ wxEventType wxNewEventType(); The class @a cls must be the wxEvent-derived class associated with the events of this type and its full declaration must be visible from the point of use of this macro. + + For example: + @code + wxDECLARE_EVENT(MY_COMMAND_EVENT, wxCommandEvent); + + class MyCustomEvent : public wxEvent { ... }; + wxDECLARE_EVENT(MY_CUSTOM_EVENT, MyCustomEvent); + @endcode */ #define wxDECLARE_EVENT(name, cls) \ wxDECLARE_EXPORTED_EVENT(wxEMPTY_PARAMETER_VALUE, name, cls) diff --git a/src/unix/sound_sdl.cpp b/src/unix/sound_sdl.cpp index 8a78505de8..14f45fa7b4 100644 --- a/src/unix/sound_sdl.cpp +++ b/src/unix/sound_sdl.cpp @@ -46,7 +46,7 @@ public: typedef void (wxEvtHandler::*wxSoundBackendSDLNotificationFunction) (wxSoundBackendSDLNotification&); -wxDECLARE_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification ) +wxDECLARE_EVENT(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification); #define EVT_SOUND_BACKEND_SDL_NOTIFICATON(func) \ DECLARE_EVENT_TABLE_ENTRY(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, \ -- 2.47.2