A few tweaks and cleanups

[wxWidgets.git] / samples / rotate / rotate.cpp

diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index 89c7a0d2999bbfd4a1db2e2b0d34894e2f485790..2f26cf2a7ef9e237bd53b923d5d986bd621f4cfa 100644 (file)
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -96,8 +96,8 @@ bool MyApp::OnInit()
 
     if ( !m_image.Ok() )
     {
-        wxLogError("Can't load the test image, please copy it to the "
-                   "program directory");
+        wxLogError(wxT("Can't load the test image, please copy it to the ")
+                   wxT("program directory"));
         return FALSE;
     }
 
@@ -161,10 +161,10 @@ void MyCanvas::OnMouseLeftUp (wxMouseEvent & event)
     const wxImage& img = wxGetApp().GetImage();
     wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), TRUE, &offset);
 
-    wxBitmap bmp = img2.ConvertToBitmap ();
+    wxBitmap bmp(img2);
 
     wxClientDC dc (this);
-    dc.DrawBitmap (img2.ConvertToBitmap(), 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
@@ -175,7 +175,7 @@ void MyCanvas::OnMouseRightUp (wxMouseEvent & event)
     const wxImage& img = wxGetApp().GetImage();
     wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), FALSE);
 
-    wxBitmap bmp = img2.ConvertToBitmap ();
+    wxBitmap bmp(img2);
 
     wxClientDC dc (this);
     dc.DrawBitmap (bmp, event.m_x, event.m_y, TRUE);