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

Use wx-prefixed macros throughout the repository.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

46
src/common/prntbase.cpp
View File

@@ -284,7 +284,7 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
// wxPrintNativeDataBase
//----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject)
wxIMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject);
wxPrintNativeDataBase::wxPrintNativeDataBase()
{
@@ -303,16 +303,16 @@ public:
void OnExit() wxOVERRIDE { wxPrintFactory::SetPrintFactory( NULL ); }
private:
DECLARE_DYNAMIC_CLASS(wxPrintFactoryModule)
wxDECLARE_DYNAMIC_CLASS(wxPrintFactoryModule);
};
IMPLEMENT_DYNAMIC_CLASS(wxPrintFactoryModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxPrintFactoryModule, wxModule);
//----------------------------------------------------------------------------
// wxPrinterBase
//----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxPrinterBase, wxObject)
wxIMPLEMENT_CLASS(wxPrinterBase, wxObject);
wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
{
@@ -351,7 +351,7 @@ wxPrintDialogData& wxPrinterBase::GetPrintDialogData() const
// wxPrinter
//----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxPrinter, wxPrinterBase)
wxIMPLEMENT_CLASS(wxPrinter, wxPrinterBase);
wxPrinter::wxPrinter(wxPrintDialogData *data)
{
@@ -410,7 +410,7 @@ wxPrintDialogData& wxPrinter::GetPrintDialogData() const
// wxPrintDialogBase: the dialog for printing.
// ---------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog)
wxIMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog);
wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
wxWindowID id,
@@ -427,7 +427,7 @@ wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
// wxPrintDialog: the dialog for printing
// ---------------------------------------------------------------------------
IMPLEMENT_CLASS(wxPrintDialog, wxObject)
wxIMPLEMENT_CLASS(wxPrintDialog, wxObject);
wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintDialogData* data)
{
@@ -468,7 +468,7 @@ wxDC *wxPrintDialog::GetPrintDC()
// wxPageSetupDialogBase: the page setup dialog
// ---------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog)
wxIMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog);
wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent,
wxWindowID id,
@@ -485,7 +485,7 @@ wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent,
// wxPageSetupDialog: the page setup dialog
// ---------------------------------------------------------------------------
IMPLEMENT_CLASS(wxPageSetupDialog, wxObject)
wxIMPLEMENT_CLASS(wxPageSetupDialog, wxObject);
wxPageSetupDialog::wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data )
{
@@ -517,9 +517,9 @@ wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupData()
// wxPrintAbortDialog
//----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
wxBEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxPrintAbortDialog::wxPrintAbortDialog(wxWindow *parent,
const wxString& documentTitle,
@@ -570,7 +570,7 @@ void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
// wxPrintout
//----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
wxIMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject);
wxPrintout::wxPrintout(const wxString& title)
{
@@ -854,9 +854,9 @@ void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff)
// wxPreviewCanvas
//----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
wxIMPLEMENT_CLASS(wxPreviewCanvas, wxWindow);
BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
wxBEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
EVT_PAINT(wxPreviewCanvas::OnPaint)
EVT_CHAR(wxPreviewCanvas::OnChar)
EVT_IDLE(wxPreviewCanvas::OnIdle)
@@ -864,7 +864,7 @@ BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
#if wxUSE_MOUSEWHEEL
EVT_MOUSEWHEEL(wxPreviewCanvas::OnMouseWheel)
#endif
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// VZ: the current code doesn't refresh properly without
// wxFULL_REPAINT_ON_RESIZE, this must be fixed as otherwise we have
@@ -1224,9 +1224,9 @@ private:
// wxPreviewControlBar
//----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
wxIMPLEMENT_CLASS(wxPreviewControlBar, wxWindow);
BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
wxBEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
EVT_BUTTON(wxID_PREVIEW_CLOSE, wxPreviewControlBar::OnWindowClose)
EVT_BUTTON(wxID_PREVIEW_PRINT, wxPreviewControlBar::OnPrintButton)
EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPreviousButton)
@@ -1246,7 +1246,7 @@ BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
EVT_CHOICE(wxID_PREVIEW_ZOOM, wxPreviewControlBar::OnZoomChoice)
EVT_PAINT(wxPreviewControlBar::OnPaint)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
wxWindow *parent, const wxPoint& pos, const wxSize& size,
@@ -1631,12 +1631,12 @@ int wxPreviewControlBar::GetZoomControl()
* Preview frame
*/
IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
wxIMPLEMENT_CLASS(wxPreviewFrame, wxFrame);
BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
wxBEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
EVT_CHAR_HOOK(wxPreviewFrame::OnChar)
EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
void wxPreviewFrame::OnChar(wxKeyEvent &event)
{
@@ -1778,7 +1778,7 @@ void wxPreviewFrame::CreateControlBar()
* Print preview
*/
IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
wxIMPLEMENT_CLASS(wxPrintPreviewBase, wxObject);
wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
wxPrintout *printoutForPrinting,
@@ -2129,7 +2129,7 @@ void wxPrintPreviewBase::SetOk(bool ok)
// wxPrintPreview
//----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
wxIMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase);
wxPrintPreview::wxPrintPreview(wxPrintout *printout,
wxPrintout *printoutForPrinting,