X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5ac656c5a220c129347e059e1fc656b00ac55d4..8366ae934aab9f835747b0c2e456231e8795fe78:/samples/rotate/rotate.cpp

diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index 3319489b51..2bdb6270e9 100644
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -22,7 +22,14 @@
 
 #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
+
 
 class MyApp: public wxApp
 {
@@ -36,6 +43,19 @@ private:
 };
 
 
+class MyCanvas: public wxScrolledWindow
+{
+public:
+    MyCanvas(wxWindow* parent);
+
+    void OnMouseLeftUp (wxMouseEvent & event);
+    void OnMouseRightUp (wxMouseEvent & event);
+
+private:
+
+    DECLARE_EVENT_TABLE()
+};
+
 class MyFrame: public wxFrame
 {
 public:
@@ -43,10 +63,7 @@ public:
 
     void OnQuit (wxCommandEvent &);
     void OnAngle(wxCommandEvent &);
-    void OnMouseLeftUp (wxMouseEvent & event);
-    void OnMouseRightUp (wxMouseEvent & event);
 
-private:
     double  m_angle;
 
     DECLARE_EVENT_TABLE()
@@ -58,31 +75,35 @@ enum
     ID_Angle
 };
 
+BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
+    EVT_LEFT_UP (MyCanvas::OnMouseLeftUp)
+    EVT_RIGHT_UP (MyCanvas::OnMouseRightUp)
+END_EVENT_TABLE()
+
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU (ID_Quit, MyFrame::OnQuit)
     EVT_MENU (ID_Angle, MyFrame::OnAngle)
-    EVT_LEFT_UP (MyFrame::OnMouseLeftUp)
-    EVT_RIGHT_UP (MyFrame::OnMouseRightUp)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
 
-
 bool MyApp::OnInit()
 {
     m_image = wxImage("kclub.bmp", wxBITMAP_TYPE_BMP);
+
+    // any unused colour will do
+    m_image.SetMaskColour( 0, 255, 255 );
+
     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;
     }
 
     MyFrame *frame = new MyFrame ("wxWindows rotate sample",
                                   wxPoint(20,20), wxSize(600,450));
 
-    frame->SetBackgroundColour (wxColour (0,80,60));
-
     frame->Show (TRUE);
     SetTopWindow (frame);
     return TRUE;
@@ -93,6 +114,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 {
     m_angle = 0.1;
 
+    new MyCanvas(this);
+
     wxMenu *menuFile = new wxMenu;
     menuFile->Append (ID_Angle, "Set &angle\tCtrl-A");
     menuFile->AppendSeparator();
@@ -113,7 +136,8 @@ void MyFrame::OnAngle (wxCommandEvent &)
                                   degrees,
                                   -180, +180,
                                   this);
-    m_angle = (degrees * M_PI) / 180.0;
+    if ( degrees != -1 )
+        m_angle = (degrees * M_PI) / 180.0;
 }
 
 void MyFrame::OnQuit (wxCommandEvent &)
@@ -121,28 +145,38 @@ void MyFrame::OnQuit (wxCommandEvent &)
     Close (TRUE);
 }
 
+MyCanvas::MyCanvas(wxWindow* parent):
+  wxScrolledWindow(parent, -1)
+{
+    SetBackgroundColour (wxColour (0,80,60));
+    Clear();
+}
 
 // Rotate with interpolation and with offset correction
-void MyFrame::OnMouseLeftUp (wxMouseEvent & event)
+void MyCanvas::OnMouseLeftUp (wxMouseEvent & event)
 {
+    MyFrame* frame = (MyFrame*) GetParent();
+
     wxPoint offset;
     const wxImage& img = wxGetApp().GetImage();
-    wxImage img2 = img.Rotate(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.ConvertToBitmap ();
 
     wxClientDC dc (this);
-    dc.DrawBitmap (img2.ConvertToBitmap(), event.m_x + offset.x, event.m_y + offset.y);
+    dc.DrawBitmap (img2.ConvertToBitmap(), event.m_x + offset.x, event.m_y + offset.y, TRUE);
 }
 
 // without interpolation, and without offset correction
-void MyFrame::OnMouseRightUp (wxMouseEvent & event)
+void MyCanvas::OnMouseRightUp (wxMouseEvent & event)
 {
+    MyFrame* frame = (MyFrame*) GetParent();
+
     const wxImage& img = wxGetApp().GetImage();
-    wxImage img2 = img.Rotate(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.ConvertToBitmap ();
 
     wxClientDC dc (this);
-    dc.DrawBitmap (bmp, event.m_x, event.m_y);
+    dc.DrawBitmap (bmp, event.m_x, event.m_y, TRUE);
 }