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

@@ -54,7 +54,7 @@ class wxAccelRefData : public wxObjectRefData
// implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS( wxAcceleratorTable, wxObject )
wxIMPLEMENT_DYNAMIC_CLASS( wxAcceleratorTable, wxObject );
QShortcut *ConvertAccelerator( wxAcceleratorEntry *e, QWidget *parent )
{

View File

@@ -14,7 +14,7 @@
#include "wx/qt/private/converter.h"
#include <QtCore/QStringList>
IMPLEMENT_DYNAMIC_CLASS( wxApp, wxAppBase )
wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxAppBase);
wxApp::wxApp()
{

View File

@@ -155,7 +155,7 @@ class wxBitmapRefData: public wxGDIRefData
// wxBitmap
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( wxBitmap, wxObject )
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxObject);
#define M_PIXDATA (*((wxBitmapRefData *)m_refData)->m_qtPixmap)
@@ -460,7 +460,7 @@ bool wxBitmap::HasAlpha() const
// wxMask
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( wxMask, wxObject )
wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject);
wxMask::wxMask()
{

View File

@@ -19,7 +19,7 @@
// wxClipboard ctor/dtor
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject);
#define QtClipboard QApplication::clipboard()
typedef wxScopedArray<wxDataFormat> wxDataFormatArray;

View File

@@ -11,7 +11,7 @@
#include "wx/control.h"
#include "wx/qt/private/converter.h"
IMPLEMENT_DYNAMIC_CLASS( wxControl, wxWindow )
wxIMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow);
wxControl::wxControl()
{

View File

@@ -36,7 +36,7 @@ void wxEndBusyCursor()
}
IMPLEMENT_DYNAMIC_CLASS( wxCursor, wxGDIObject )
wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject);
wxCursor::wxCursor( const wxCursor &cursor )
{

View File

@@ -15,7 +15,7 @@
#include <QtGui/QScreen>
#include <QPixmap>
IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )
: wxWindowDCImpl( owner )

View File

@@ -69,7 +69,7 @@ public:
}
};
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxDialog)
wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxDialog);
wxFileDialog::wxFileDialog(wxWindow *parent,
const wxString& message,
@@ -210,7 +210,7 @@ public:
}
};
IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog)
wxIMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog);
wxDirDialog::wxDirDialog(wxWindow *parent,
const wxString& message,

View File

@@ -26,7 +26,7 @@ public:
}
};
IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
bool wxFontDialog::DoCreate(wxWindow *parent)
{

View File

@@ -68,7 +68,7 @@ void wxQtGLWidget::paintGL()
// wxGlContext
//---------------------------------------------------------------------------
IMPLEMENT_CLASS(wxGLContext, wxWindow)
wxIMPLEMENT_CLASS(wxGLContext, wxWindow);
wxGLContext::wxGLContext(wxGLCanvas *WXUNUSED(win), const wxGLContext* WXUNUSED(other))
{
@@ -86,7 +86,7 @@ bool wxGLContext::SetCurrent(const wxGLCanvas&) const
// wxGlCanvas
//---------------------------------------------------------------------------
IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
wxGLCanvas::wxGLCanvas(wxWindow *parent,
wxWindowID id,

View File

@@ -34,7 +34,7 @@ class wxQtMdiArea : public wxQtEventSignalHandler< QMdiArea, wxMDIClientWindow >
wxQtMdiArea( wxWindow *parent, wxMDIClientWindow *handler );
};
IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
wxIMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame);
wxMDIParentFrame::wxMDIParentFrame()
{

View File

@@ -17,6 +17,6 @@
#include "wx/minifram.h"
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
wxIMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame);
#endif // wxUSE_MINIFRAME

View File

@@ -52,7 +52,7 @@ void wxQtButtonGroup::buttonClicked(int index) {
}
IMPLEMENT_DYNAMIC_CLASS( wxRadioBox, wxControl )
wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
wxRadioBox::wxRadioBox()

View File

@@ -19,7 +19,7 @@ bool wxTaskBarIconBase::IsAvailable()
//=============================================================================
IMPLEMENT_DYNAMIC_CLASS( wxTaskBarIcon, wxTaskBarIconBase )
wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxTaskBarIconBase);
wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
{

View File

@@ -44,7 +44,7 @@ void wxQtToggleButton::clicked( bool checked )
wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
IMPLEMENT_DYNAMIC_CLASS( wxBitmapToggleButton, wxToggleButtonBase )
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButtonBase);
wxBitmapToggleButton::wxBitmapToggleButton()
{

View File

@@ -88,7 +88,7 @@ void wxQtToolButton::enterEvent( QEvent *WXUNUSED(event) )
toolbar->OnMouseEnter( handler->GetId() );
}
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
void wxToolBarTool::SetLabel( const wxString &label )
{

View File

@@ -82,7 +82,7 @@ void wxQtShortcutHandler::activated()
//##############################################################################
#ifdef __WXUNIVERSAL__
IMPLEMENT_ABSTRACT_CLASS(wxWindow, wxWindowBase)
wxIMPLEMENT_ABSTRACT_CLASS(wxWindow, wxWindowBase);
#endif // __WXUNIVERSAL__
// We use the QObject property capabilities to store the wxWindow pointer, so we