fixed bug with the caret positioning after SetValue() introduced by the last commit

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

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 7be138f0c1a92b177aa75afb1ff50af9d8fb1470..a8e88e1fd7205aa4a5d1d947f6cf4256d42f047e 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -83,7 +83,6 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     PrepareDC( dc );
 
     DrawShapes(dc);
     PrepareDC( dc );
 
     DrawShapes(dc);

-

 }
 
 void MyCanvas::OnEraseBackground(wxEraseEvent& event)
 }
 
 void MyCanvas::OnEraseBackground(wxEraseEvent& event)


@@ -184,7 +183,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
                 }
                 case SHAPE_DRAG_TEXT:
                 {
                 }
                 case SHAPE_DRAG_TEXT:
                 {

-                    m_dragImage = new wxDragImage("Dragging some test text", wxCursor(wxCURSOR_HAND));
+                    m_dragImage = new wxDragImage(wxString("Dragging some test text"), wxCursor(wxCURSOR_HAND));

                     break;
                 }
                 case SHAPE_DRAG_ICON:
                     break;
                 }
                 case SHAPE_DRAG_ICON:


@@ -320,7 +319,6 @@ DragShape* MyCanvas::FindShape(const wxPoint& pt) const
 }
 
 // MyFrame
 }
 
 // MyFrame

-

 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 BEGIN_EVENT_TABLE(MyFrame,wxFrame)
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 BEGIN_EVENT_TABLE(MyFrame,wxFrame)


@@ -387,7 +385,6 @@ bool MyApp::OnInit()
         m_background = image.ConvertToBitmap();
     }
 
         m_background = image.ConvertToBitmap();
     }
 

-

     MyFrame *frame = new MyFrame();
 
     wxString rootName("shape0");
     MyFrame *frame = new MyFrame();
 
     wxString rootName("shape0");


@@ -396,7 +393,7 @@ bool MyApp::OnInit()
     for (i = 1; i < 4; i++)
     {
         wxString filename;
     for (i = 1; i < 4; i++)
     {
         wxString filename;

-        filename.Printf("%s%d.png", (const char*) rootName, i);
+        filename.Printf(wxT("%s%d.png"), (const wxChar*)rootName, i);

         if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
         {
             DragShape* newShape = new DragShape(image.ConvertToBitmap());
         if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
         {
             DragShape* newShape = new DragShape(image.ConvertToBitmap());


@@ -434,6 +431,11 @@ bool MyApp::OnInit()
     return TRUE;
 }
 
     return TRUE;
 }
 

+int MyApp::OnExit()
+{
+    return 0;
+}
+

 bool MyApp::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
 {
     int w = bitmap.GetWidth();
 bool MyApp::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
 {
     int w = bitmap.GetWidth();