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:
@@ -96,7 +96,7 @@ void FindMax(int *max_thing, int thing);
|
||||
STDAPI_(__int64) CeGetRandomSeed();
|
||||
#endif
|
||||
|
||||
IMPLEMENT_APP(MyApp)
|
||||
wxIMPLEMENT_APP(MyApp);
|
||||
|
||||
MainWindow *TheMainWindow = NULL;
|
||||
|
||||
@@ -108,11 +108,11 @@ void MainWindow::CreateFonts()
|
||||
m_italicFont = wxTheFontList->FindOrCreateFont(pointSize, wxSWISS, wxITALIC, wxNORMAL);
|
||||
}
|
||||
|
||||
BEGIN_EVENT_TABLE(MainWindow, wxFrame)
|
||||
wxBEGIN_EVENT_TABLE(MainWindow, wxFrame)
|
||||
EVT_CLOSE(MainWindow::OnCloseWindow)
|
||||
EVT_CHAR(MainWindow::OnChar)
|
||||
EVT_MENU(wxID_ANY, MainWindow::OnPopup)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
MainWindow::MainWindow(wxFrame *frame, wxWindowID id, const wxString& title,
|
||||
const wxPoint& pos, const wxSize& size, long style):
|
||||
@@ -581,11 +581,11 @@ void MainWindow::OnChar(wxKeyEvent& event)
|
||||
canvas->OnChar(event);
|
||||
}
|
||||
|
||||
BEGIN_EVENT_TABLE(MyCanvas, wxWindow)
|
||||
wxBEGIN_EVENT_TABLE(MyCanvas, wxWindow)
|
||||
EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
|
||||
EVT_CHAR(MyCanvas::OnChar)
|
||||
EVT_PAINT(MyCanvas::OnPaint)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
// Define a constructor for my canvas
|
||||
MyCanvas::MyCanvas(wxFrame *frame):
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
int OnExit();
|
||||
};
|
||||
|
||||
DECLARE_APP(MyApp)
|
||||
wxDECLARE_APP(MyApp);
|
||||
|
||||
// Define a new canvas which can receive some events
|
||||
class MyCanvas: public wxWindow
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
private:
|
||||
wxMenu *m_popupMenu;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
// Define a new frame
|
||||
@@ -94,7 +94,7 @@ private:
|
||||
// Icons
|
||||
wxIcon *m_corners[4];
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
// Menu items
|
||||
|
Reference in New Issue
Block a user