Use wx-prefixed macros throughout the repository.

Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
Dimitri Schoolwerth
2015-04-23 15:49:01 +04:00
parent 2d3f617b34
commit 8f8d58d193
1697 changed files with 3543 additions and 3543 deletions

View File

@@ -1500,10 +1500,10 @@ public:
void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxFontModule)
wxDECLARE_DYNAMIC_CLASS(wxFontModule);
};
IMPLEMENT_DYNAMIC_CLASS(wxFontModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxFontModule, wxModule);
bool wxFontModule::OnInit()
{

View File

@@ -112,7 +112,7 @@ typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC)
// wxGLContext implementation
// ============================================================================
IMPLEMENT_CLASS(wxGLContext, wxObject)
wxIMPLEMENT_CLASS(wxGLContext, wxObject);
wxGLContext::wxGLContext(wxGLCanvas *gc, const wxGLContext *other)
{

View File

@@ -52,7 +52,7 @@ enum {
};
IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
wxIMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject);
////////////////////////////////////////////////////////////////////////////

View File

@@ -226,7 +226,7 @@ public:
friend class wxGStreamerMediaEventHandler;
friend class wxGStreamerLoadWaitTimer;
DECLARE_DYNAMIC_CLASS(wxGStreamerMediaBackend)
wxDECLARE_DYNAMIC_CLASS(wxGStreamerMediaBackend);
};
//-----------------------------------------------------------------------------
@@ -256,7 +256,7 @@ class wxGStreamerMediaEventHandler : public wxEvtHandler
// Implementation
//=============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend)
wxIMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend);
//-----------------------------------------------------------------------------
//

View File

@@ -714,9 +714,9 @@ class wxSoundCleanupModule: public wxModule
public:
bool OnInit() wxOVERRIDE { return true; }
void OnExit() wxOVERRIDE { wxSound::UnloadBackend(); }
DECLARE_DYNAMIC_CLASS(wxSoundCleanupModule)
wxDECLARE_DYNAMIC_CLASS(wxSoundCleanupModule);
};
IMPLEMENT_DYNAMIC_CLASS(wxSoundCleanupModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxSoundCleanupModule, wxModule);
#endif

View File

@@ -37,7 +37,7 @@
class wxSoundBackendSDLNotification : public wxEvent
{
public:
DECLARE_DYNAMIC_CLASS(wxSoundBackendSDLNotification)
wxDECLARE_DYNAMIC_CLASS(wxSoundBackendSDLNotification);
wxSoundBackendSDLNotification();
wxEvent *Clone() const { return new wxSoundBackendSDLNotification(*this); }
};
@@ -54,7 +54,7 @@ wxDECLARE_EVENT(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotificat
wxEVENT_HANDLER_CAST( wxSoundBackendSDLNotificationFunction, func ), \
NULL ),
IMPLEMENT_DYNAMIC_CLASS(wxSoundBackendSDLNotification, wxEvtHandler)
wxIMPLEMENT_DYNAMIC_CLASS(wxSoundBackendSDLNotification, wxEvtHandler);
wxDEFINE_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification );
wxSoundBackendSDLNotification::wxSoundBackendSDLNotification()
@@ -114,12 +114,12 @@ private:
}
wxSoundBackendSDL *m_backend;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
BEGIN_EVENT_TABLE(wxSoundBackendSDLEvtHandler, wxEvtHandler)
wxBEGIN_EVENT_TABLE(wxSoundBackendSDLEvtHandler, wxEvtHandler)
EVT_SOUND_BACKEND_SDL_NOTIFICATON(wxSoundBackendSDLEvtHandler::OnNotify)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxSoundBackendSDL::~wxSoundBackendSDL()
{

View File

@@ -100,15 +100,15 @@ protected:
wxPoint m_pos;
wxBitmap m_bmp;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
wxBEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
EVT_SIZE(wxTaskBarIconArea::OnSizeChange)
EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent)
EVT_MENU(wxID_ANY, wxTaskBarIconArea::OnMenuEvent)
EVT_PAINT(wxTaskBarIconArea::OnPaint)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
: wxTaskBarIconAreaBase(), m_icon(icon), m_bmp(bmp)
@@ -246,7 +246,7 @@ bool wxTaskBarIconBase::IsAvailable()
// wxTaskBarIcon class:
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler);
wxTaskBarIcon::wxTaskBarIcon() : m_iconWnd(NULL)
{

View File

@@ -1781,10 +1781,10 @@ public:
virtual void OnExit() wxOVERRIDE;
private:
DECLARE_DYNAMIC_CLASS(wxThreadModule)
wxDECLARE_DYNAMIC_CLASS(wxThreadModule);
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule);
bool wxThreadModule::OnInit()
{

View File

@@ -241,10 +241,10 @@ public:
virtual bool OnInit() wxOVERRIDE { return true; }
virtual void OnExit() wxOVERRIDE { wxTimerScheduler::Shutdown(); }
DECLARE_DYNAMIC_CLASS(wxTimerUnixModule)
wxDECLARE_DYNAMIC_CLASS(wxTimerUnixModule);
};
IMPLEMENT_DYNAMIC_CLASS(wxTimerUnixModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxTimerUnixModule, wxModule);
// ============================================================================
// global functions

View File

@@ -1281,10 +1281,10 @@ public:
gs_envVars.clear();
}
DECLARE_DYNAMIC_CLASS(wxSetEnvModule)
wxDECLARE_DYNAMIC_CLASS(wxSetEnvModule);
};
IMPLEMENT_DYNAMIC_CLASS(wxSetEnvModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxSetEnvModule, wxModule);
#endif // USE_PUTENV