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

use "new" wx-prefixed macros in samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 07:07:55 +00:00
parent a1cb57f549
commit fa10b28e50
162 changed files with 698 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/image/image.cpp
View File

@@ -104,8 +104,8 @@ private:
static wxString LoadUserImage(wxImage& image);
DECLARE_DYNAMIC_CLASS(MyFrame)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(MyFrame);
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -437,7 +437,7 @@ private:
wxBitmap m_bitmap;
double m_zoom;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#ifdef wxHAVE_RAW_BITMAP
@@ -574,7 +574,7 @@ private:
wxBitmap m_bitmap;
wxBitmap m_alphaBitmap;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif // wxHAVE_RAW_BITMAP
@@ -588,7 +588,7 @@ private:
// MyImageFrame
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
EVT_PAINT(MyImageFrame::OnPaint)
@@ -599,7 +599,7 @@ BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
EVT_MENU(wxID_ZOOM_IN, MyImageFrame::OnZoom)
EVT_MENU(wxID_ZOOM_OUT, MyImageFrame::OnZoom)
EVT_MENU(wxID_ZOOM_100, MyImageFrame::OnZoom)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
//-----------------------------------------------------------------------------
// MyRawBitmapFrame
@@ -607,9 +607,9 @@ END_EVENT_TABLE()
#ifdef wxHAVE_RAW_BITMAP
BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame)
EVT_PAINT(MyRawBitmapFrame::OnPaint)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
#endif // wxHAVE_RAW_BITMAP
@@ -629,7 +629,7 @@ enum
};
IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU (ID_ABOUT, MyFrame::OnAbout)
EVT_MENU (ID_QUIT, MyFrame::OnQuit)
EVT_MENU (ID_NEW, MyFrame::OnNewFrame)
@@ -645,7 +645,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_COPY, MyFrame::OnCopy)
EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
#endif // wxUSE_CLIPBOARD
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyFrame::MyFrame()
: wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxImage sample"),