Use wxICON as portable feature.

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

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 974ffe93391f081e6d83b74db94a8047ab62c62c..8b5be97a0fd892e211cd11779a0822ad349e5240 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -188,15 +188,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
                 }
                 case SHAPE_DRAG_ICON:
                 {
-                    // Can anyone explain why this test is necessary,
-                    // to prevent a gcc error?
-#if defined(__WXMOTIF__) || defined(__WXX11__)
-                    wxIcon icon(dragicon_xpm);
-#else
-                    wxIcon icon(wxICON(dragicon));
-#endif
-
-                    m_dragImage = new wxDragImage(icon, wxCursor(wxCURSOR_HAND));
+                    m_dragImage = new wxDragImage(wxICON(dragicon), wxCursor(wxCURSOR_HAND));
                     break;
                 }
             }