added moving an object with the mouse

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/canvas/test/test.cpp b/contrib/samples/canvas/test/test.cpp
index a812ff6eb1538f3706c16ad372a0bcd7fc4e9d0e..4a53fa7d249f4f9496830e567cce2d9db6960270 100644 (file)
--- a/contrib/samples/canvas/test/test.cpp
+++ b/contrib/samples/canvas/test/test.cpp
@@ -21,6 +21,7 @@
 #include <wx/file.h>
 #include <wx/timer.h>
 #include <wx/log.h>
 #include <wx/file.h>
 #include <wx/timer.h>
 #include <wx/log.h>

+#include "wx/image.h"

 
 
 #include "smile.xpm"
 
 
 #include "smile.xpm"


@@ -29,6 +30,52 @@
 
 // derived classes
 
 
 // derived classes
 

+
+class MywxCanvasImage: public wxCanvasImage
+{
+public:
+    MywxCanvasImage( const wxImage &image, double x, double y, double w, double h );
+
+    void MywxCanvasImage::OnMouse(wxMouseEvent &event);
+
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(MywxCanvasImage,wxCanvasImage)
+  EVT_MOUSE_EVENTS( MywxCanvasImage::OnMouse )
+END_EVENT_TABLE()
+
+MywxCanvasImage::MywxCanvasImage( const wxImage &image, double x, double y, double w, double h )
+    :wxCanvasImage( image, x, y, w, h )
+{
+}
+
+void MywxCanvasImage::OnMouse(wxMouseEvent &event)
+{
+    static bool first=false;
+    static dx=0;
+    static dy=0;
+
+    int x = event.GetX();
+    int y = event.GetY();
+    if (event.m_leftDown)
+    {   if (!first)
+        {
+           first=true;
+           dx=x;
+           dy=y;
+        }
+        Move(m_area.x+x-dx,m_area.y+y-dy);
+        CaptureMouse();
+    }
+    else if (IsCapturedMouse())
+    {
+        ReleaseMouse();
+        first=false;
+        dx=0;dy=0;
+    }
+}
+

 class MyFrame;
 class MyApp;
 
 class MyFrame;
 class MyApp;
 


@@ -107,7 +154,7 @@ MyFrame::MyFrame()
     SetStatusWidths( 2, widths );
 
     m_canvas = new wxCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
     SetStatusWidths( 2, widths );
 
     m_canvas = new wxCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );

-    
+

     m_canvas->Freeze();
 
     m_canvas->SetArea( 400, 600 );
     m_canvas->Freeze();
 
     m_canvas->SetArea( 400, 600 );


@@ -139,9 +186,12 @@ MyFrame::MyFrame()
     m_canvas->Append( m_sm3 );
 
     for (i = 10; i < 300; i+=10)
     m_canvas->Append( m_sm3 );
 
     for (i = 10; i < 300; i+=10)

-        m_canvas->Append( new wxCanvasLine( 10,150,i,300, 0,255,0 ) );
-                    
-    m_sm4 = new wxCanvasImage( image, 0,270,64,32 );
+        m_canvas->Append( new wxCanvasLine( 10,-15,i,300, 0,255,0 ) );
+
+//    m_canvas->Append( new wxCanvasLine( 10,-1500e6,50,300000e6, 0,255,0 ) );
+//    m_canvas->Append( new wxCanvasLine( 10,-150000,50,300000, 0,255,0 ) );
+
+    m_sm4 = new MywxCanvasImage( image, 0,270,64,32 );

     m_canvas->Append( m_sm4 );
 
     m_canvas->Thaw();
     m_canvas->Append( m_sm4 );
 
     m_canvas->Thaw();


@@ -149,9 +199,9 @@ MyFrame::MyFrame()
     m_log = new wxTextCtrl( this, -1, "", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
     wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
     delete old_log;
     m_log = new wxTextCtrl( this, -1, "", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
     wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
     delete old_log;

-    
+

     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

-    
+

     topsizer->Add( m_canvas, 1, wxEXPAND );
     topsizer->Add( m_log, 0, wxEXPAND );
 
     topsizer->Add( m_canvas, 1, wxEXPAND );
     topsizer->Add( m_log, 0, wxEXPAND );