X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4f3eb42f2cad4f69b2543c1d6985d9c028f9dc0..1e72e3cc53f04cc79189ab5d0f6fecca3f68a2ee:/samples/rotate/rotate.cpp?ds=sidebyside diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp index 3a11213e83..c540983239 100644 --- a/samples/rotate/rotate.cpp +++ b/samples/rotate/rotate.cpp @@ -99,19 +99,19 @@ bool MyApp::OnInit() { wxLogError(wxT("Can't load the test image, please copy it to the ") wxT("program directory")); - return FALSE; + return false; } - MyFrame *frame = new MyFrame (_T("wxWindows rotate sample"), + MyFrame *frame = new MyFrame (_T("wxWidgets rotate sample"), wxPoint(20,20), wxSize(600,450)); - frame->Show (TRUE); + frame->Show (true); SetTopWindow (frame); - return TRUE; + return true; } MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { m_angle = 0.1; @@ -133,7 +133,7 @@ void MyFrame::OnAngle (wxCommandEvent &) long degrees = (long)((180*m_angle)/M_PI); degrees = wxGetNumberFromUser(_T("Change the image rotation angle"), _T("Angle in degrees:"), - _T("wxWindows rotate sample"), + _T("wxWidgets rotate sample"), degrees, -180, +180, this); @@ -143,11 +143,11 @@ void MyFrame::OnAngle (wxCommandEvent &) void MyFrame::OnQuit (wxCommandEvent &) { - Close (TRUE); + Close (true); } MyCanvas::MyCanvas(wxWindow* parent): - wxScrolledWindow(parent, -1) + wxScrolledWindow(parent, wxID_ANY) { SetBackgroundColour (wxColour (0,80,60)); ClearBackground(); @@ -160,12 +160,12 @@ void MyCanvas::OnMouseLeftUp (wxMouseEvent & event) wxPoint offset; const wxImage& img = wxGetApp().GetImage(); - wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), TRUE, &offset); + wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), true, &offset); wxBitmap bmp(img2); wxClientDC dc (this); - dc.DrawBitmap (bmp, event.m_x + offset.x, event.m_y + offset.y, TRUE); + dc.DrawBitmap (bmp, event.m_x + offset.x, event.m_y + offset.y, true); } // without interpolation, and without offset correction @@ -174,10 +174,10 @@ void MyCanvas::OnMouseRightUp (wxMouseEvent & event) MyFrame* frame = (MyFrame*) GetParent(); const wxImage& img = wxGetApp().GetImage(); - wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), FALSE); + wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), false); wxBitmap bmp(img2); wxClientDC dc (this); - dc.DrawBitmap (bmp, event.m_x, event.m_y, TRUE); + dc.DrawBitmap (bmp, event.m_x, event.m_y, true); }