oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index 2f26cf2a7ef9e237bd53b923d5d986bd621f4cfa..f2baa3715cea3ec90c259ffe7bc0df93253367f6 100644 (file)
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -21,15 +21,7 @@
 #endif
 
 #include "wx/image.h"
-
-/* GRG: This is not ANSI standard, define M_PI explicitly
-#include <math.h>       // M_PI
-*/
-
-#ifndef M_PI
-#define M_PI 3.1415926535897932384626433832795
-#endif
-
+#include "wx/numdlg.h"
 
 class MyApp: public wxApp
 {
@@ -89,7 +81,7 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
-    m_image = wxImage("kclub.bmp", wxBITMAP_TYPE_BMP);
+    m_image = wxImage(_T("kclub.bmp"), wxBITMAP_TYPE_BMP);
 
     // any unused colour will do
     m_image.SetMaskColour( 0, 255, 255 );
@@ -98,31 +90,31 @@ 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 ("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;
 
     new MyCanvas(this);
 
     wxMenu *menuFile = new wxMenu;
-    menuFile->Append (ID_Angle, "Set &angle\tCtrl-A");
+    menuFile->Append (ID_Angle, _T("Set &angle\tCtrl-A"));
     menuFile->AppendSeparator();
-    menuFile->Append (ID_Quit, "E&xit\tAlt-X");
+    menuFile->Append (ID_Quit, _T("E&xit\tAlt-X"));
 
     wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append (menuFile, "&File");
+    menuBar->Append (menuFile, _T("&File"));
 
     SetMenuBar (menuBar);
 }
@@ -130,9 +122,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 void MyFrame::OnAngle (wxCommandEvent &)
 {
     long degrees = (long)((180*m_angle)/M_PI);
-    degrees = wxGetNumberFromUser("Change the image rotation angle",
-                                  "Angle in degrees:",
-                                  "wxWindows rotate sample",
+    degrees = wxGetNumberFromUser(_T("Change the image rotation angle"),
+                                  _T("Angle in degrees:"),
+                                  _T("wxWidgets rotate sample"),
                                   degrees,
                                   -180, +180,
                                   this);
@@ -142,14 +134,14 @@ 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));
-    Clear();
+    ClearBackground();
 }
 
 // Rotate with interpolation and with offset correction
@@ -159,12 +151,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
@@ -173,10 +165,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);
 }