Add more wxOVERRIDE

This commit is contained in:
Maarten Bent
2018-09-21 19:46:49 +02:00
committed by Vadim Zeitlin
parent 455a45f5a8
commit 7c1ab06ea5
51 changed files with 193 additions and 193 deletions

View File

@@ -21,7 +21,7 @@ class BombsFrame;
class BombsApp: public wxApp
{
public:
virtual bool OnInit();
virtual bool OnInit() wxOVERRIDE;
private :
BombsFrame *m_frame;

View File

@@ -23,7 +23,7 @@ public:
FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size);
virtual ~FortyCanvas();
virtual void OnDraw(wxDC& dc);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
bool OnCloseCanvas();
void OnMouseEvent(wxMouseEvent& event);
void SetCursorStyle(int x, int y);

View File

@@ -17,7 +17,7 @@ class FortyApp: public wxApp
public:
FortyApp(){}
virtual ~FortyApp();
bool OnInit();
bool OnInit() wxOVERRIDE;
static const wxColour& BackgroundColour();
static const wxColour& TextColour();

View File

@@ -24,11 +24,11 @@ class Pack : public Pile {
public:
Pack(int x, int y);
virtual ~Pack();
void Redraw(wxDC& dc);
void ResetPile() { m_topCard = NumCards - 1; }
void Redraw(wxDC& dc) wxOVERRIDE;
void ResetPile() wxOVERRIDE { m_topCard = NumCards - 1; }
void Shuffle();
void AddCard(Card* card); // Add card
void AddCard(wxDC& dc, Card* card) { AddCard(card); Redraw(dc); }
void AddCard(Card* card) wxOVERRIDE; // Add card
void AddCard(wxDC& dc, Card* card) wxOVERRIDE { AddCard(card); Redraw(dc); }
};
@@ -39,7 +39,7 @@ class Base : public Pile {
public:
Base(int x, int y);
virtual ~Base(){}
bool AcceptCard(Card* card);
bool AcceptCard(Card* card) wxOVERRIDE;
};
@@ -50,7 +50,7 @@ class Foundation : public Pile {
public:
Foundation(int x, int y);
virtual ~Foundation(){}
bool AcceptCard(Card* card);
bool AcceptCard(Card* card) wxOVERRIDE;
};
@@ -61,9 +61,9 @@ class Discard : public Pile {
public:
Discard(int x, int y);
virtual ~Discard(){}
void Redraw(wxDC& dc);
void GetTopCardPos(int& x, int& y);
Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset);
void Redraw(wxDC& dc) wxOVERRIDE;
void GetTopCardPos(int& x, int& y) wxOVERRIDE;
Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset) wxOVERRIDE;
};

View File

@@ -54,7 +54,7 @@ static wxMenuBar *menuBar = NULL;
class MyApp: public wxApp
{
public:
bool OnInit();
bool OnInit() wxOVERRIDE;
};
wxIMPLEMENT_APP(MyApp);

View File

@@ -926,8 +926,8 @@ class LifeModule: public wxModule
public:
LifeModule() {};
bool OnInit();
void OnExit();
bool OnInit() wxOVERRIDE;
void OnExit() wxOVERRIDE;
};
wxIMPLEMENT_DYNAMIC_CLASS(LifeModule, wxModule);

View File

@@ -153,7 +153,7 @@ private:
class LifeApp : public wxApp
{
public:
virtual bool OnInit();
virtual bool OnInit() wxOVERRIDE;
};
#endif // _LIFE_APP_H_

View File

@@ -21,8 +21,8 @@
class MyApp: public wxApp
{
public:
bool OnInit();
int OnExit();
bool OnInit() wxOVERRIDE;
int OnExit() wxOVERRIDE;
};
wxDECLARE_APP(MyApp);