diff --git a/include/wx/event.h b/include/wx/event.h index 5fee9d2141..4ebbb27f5b 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -123,7 +123,7 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType(); // Declare a local (not exported) wxEventType-based event type: - #define wxDECLARE_LOCAL_EVENT( name, type ) \ + #define wxDECLARE__EVENT( name, type ) \ wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) // Try to cast the given event handler to the correct handler type: @@ -152,7 +152,7 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType(); // Declare a local (not exported) templatized event type: - #define wxDECLARE_LOCAL_EVENT( name, type ) \ + #define wxDECLARE__EVENT( name, type ) \ wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) // Don't cast the given event handler so that wxEvtHandler::Connect() sees diff --git a/samples/event/event.cpp b/samples/event/event.cpp index 4461234bb9..27f0d2e505 100644 --- a/samples/event/event.cpp +++ b/samples/event/event.cpp @@ -35,7 +35,7 @@ // ---------------------------------------------------------------------------- // define a custom event type (we don't need a separate declaration here but -// usually you would use a matching wxDECLARE_LOCAL_EVENT in a header) +// usually you would use a matching wxDECLARE_EVENT in a header) wxDEFINE_EVENT(wxEVT_MY_CUSTOM_COMMAND, wxCommandEvent) // it may also be convenient to define an event table macro for this event type diff --git a/src/unix/sound_sdl.cpp b/src/unix/sound_sdl.cpp index 4b21eeac9e..dff43eeaee 100644 --- a/src/unix/sound_sdl.cpp +++ b/src/unix/sound_sdl.cpp @@ -46,7 +46,7 @@ public: typedef void (wxEvtHandler::*wxSoundBackendSDLNotificationFunction) (wxSoundBackendSDLNotification&); -wxDECLARE_LOCAL_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, \