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

@@ -28,9 +28,9 @@
#include "playerdg.h"
#include "canvas.h"
BEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
wxBEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
EVT_MOUSE_EVENTS(FortyCanvas::OnMouseEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :
wxScrolledWindow(parent, wxID_ANY, pos, size, 0),

View File

@@ -39,7 +39,7 @@ public:
void LayoutGame();
void ShowPlayerDialog();
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
private:
wxFont* m_font;

View File

@@ -34,7 +34,7 @@
#include "wx/stockitem.h"
BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(FortyFrame, wxFrame)
EVT_MENU(wxID_NEW, FortyFrame::NewGame)
EVT_MENU(wxID_EXIT, FortyFrame::Exit)
EVT_MENU(wxID_ABOUT, FortyFrame::About)
@@ -46,10 +46,10 @@ BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
EVT_MENU(HELPING_HAND, FortyFrame::ToggleHelpingHand)
EVT_MENU(LARGE_CARDS, FortyFrame::ToggleCardSize)
EVT_CLOSE(FortyFrame::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Create a new application object
IMPLEMENT_APP (FortyApp)
wxIMPLEMENT_APP(FortyApp);
wxColour* FortyApp::m_backgroundColour = 0;
wxColour* FortyApp::m_textColour = 0;

View File

@@ -31,7 +31,7 @@ private:
wxString m_helpFile;
};
DECLARE_APP(FortyApp)
wxDECLARE_APP(FortyApp);
class FortyCanvas;
class FortyFrame: public wxFrame
@@ -56,7 +56,7 @@ public:
FortyCanvas* GetCanvas() { return m_canvas; }
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
private:
enum MenuCommands {

View File

@@ -24,13 +24,13 @@
const int ID_LISTBOX = 101;
BEGIN_EVENT_TABLE(PlayerSelectionDialog, wxDialog)
wxBEGIN_EVENT_TABLE(PlayerSelectionDialog, wxDialog)
EVT_SIZE(PlayerSelectionDialog::OnSize)
EVT_BUTTON(wxID_OK, PlayerSelectionDialog::ButtonCallback)
EVT_BUTTON(wxID_CANCEL, PlayerSelectionDialog::ButtonCallback)
EVT_LISTBOX(ID_LISTBOX, PlayerSelectionDialog::SelectCallback)
EVT_CLOSE(PlayerSelectionDialog::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
PlayerSelectionDialog::PlayerSelectionDialog(
wxWindow* parent,

View File

@@ -23,7 +23,7 @@ public:
void SelectCallback(wxCommandEvent& event);
void OnSize(wxSizeEvent& event);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
protected:
friend void SelectCallback(wxListBox&, wxCommandEvent&);

View File

@@ -125,9 +125,9 @@ void ScoreCanvas::OnDraw(wxDC& dc)
}
#endif
BEGIN_EVENT_TABLE(ScoreDialog, wxDialog)
wxBEGIN_EVENT_TABLE(ScoreDialog, wxDialog)
EVT_CLOSE(ScoreDialog::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) :
wxDialog(parent, wxID_ANY, _("Scores"),

View File

@@ -27,7 +27,7 @@ private:
ScoreFile* m_scoreFile;
wxButton* m_OK;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif