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

remove semicolon from wxDECLARE_EVENT; having it there was inconsistent with other wxXXX_EVENT macros and generally unexpected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-14 12:47:46 +00:00
parent 8fa2cfe258
commit ff3fd98a08
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/event.h
View File

@@ -124,7 +124,7 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
// Declare a local (not exported) wxEventType-based event type: // Declare a local (not exported) wxEventType-based event type:
#define wxDECLARE_EVENT( name, type ) \ #define wxDECLARE_EVENT( name, type ) \
wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ); wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
#else #else
// Define/Declare a templatized event type with the corresponding event as // 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: // Declare a local (not exported) templatized event type:
#define wxDECLARE_EVENT( name, type ) \ #define wxDECLARE_EVENT( name, type ) \
wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ); wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
#endif #endif

8
interface/wx/event.h
View File

@@ -3823,6 +3823,14 @@ wxEventType wxNewEventType();
The class @a cls must be the wxEvent-derived class associated with the 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 events of this type and its full declaration must be visible from the point
of use of this macro. 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) \ #define wxDECLARE_EVENT(name, cls) \
wxDECLARE_EXPORTED_EVENT(wxEMPTY_PARAMETER_VALUE, name, cls) wxDECLARE_EXPORTED_EVENT(wxEMPTY_PARAMETER_VALUE, name, cls)

2
src/unix/sound_sdl.cpp
View File

@@ -46,7 +46,7 @@ public:
typedef void (wxEvtHandler::*wxSoundBackendSDLNotificationFunction) typedef void (wxEvtHandler::*wxSoundBackendSDLNotificationFunction)
(wxSoundBackendSDLNotification&); (wxSoundBackendSDLNotification&);
wxDECLARE_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification ) wxDECLARE_EVENT(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification);
#define EVT_SOUND_BACKEND_SDL_NOTIFICATON(func) \ #define EVT_SOUND_BACKEND_SDL_NOTIFICATON(func) \
DECLARE_EVENT_TABLE_ENTRY(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, \ DECLARE_EVENT_TABLE_ENTRY(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, \