minor clean up

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

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index e803877a1e3c0f2df17d1c9535c139e12837b24a..fd7d182c44af00dbbefdbd312c04091c246f3b25 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -36,7 +36,7 @@
 
 #include "dragimag.h"
 
 
 #include "dragimag.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

 #include "mondrian.xpm"
 #include "dragicon.xpm"
 #endif
 #include "mondrian.xpm"
 #include "dragicon.xpm"
 #endif


@@ -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)


@@ -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");


@@ -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();