Make wxImageList not copiable (fixes #10503), replace wxList with wxObjectList

[wxWidgets.git] / include / wx / msw / dragimag.h

diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index 49b745c8363fc07472aeb35bb16ed5138e94c76c..da33ac07959aa00d82d743b0e87f8f99f63eea4e 100644 (file)
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -13,9 +13,7 @@
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 

-#ifdef __GNUG__
-#pragma interface "dragimag.h"
-#endif
+#if wxUSE_DRAGIMAGE

 
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"


@@ -32,7 +30,7 @@
   void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
   {
 #ifdef __WXMSW__
   void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
   {
 #ifdef __WXMSW__

-    ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWindows
+    ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets

 #endif
 
     CaptureMouse();
 #endif
 
     CaptureMouse();


@@ -101,7 +99,7 @@
  * wxDragImage
  */
 
  * wxDragImage
  */
 

-class WXDLLEXPORT wxDragImage: public wxObject
+class WXDLLIMPEXP_CORE wxDragImage: public wxObject

 {
 public:
 
 {
 public:
 


@@ -154,21 +152,25 @@ public:
         Create(str, cursor, cursorHotspot);
     }
 
         Create(str, cursor, cursorHotspot);
     }
 

+#if wxUSE_TREECTRL

     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {
         Init();
 
         Create(treeCtrl, id);
     }
     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {
         Init();
 
         Create(treeCtrl, id);
     }

+#endif

 
 

+#if wxUSE_LISTCTRL

     wxDragImage(const wxListCtrl& listCtrl, long id)
     {
         Init();
 
         Create(listCtrl, id);
     }
     wxDragImage(const wxListCtrl& listCtrl, long id)
     {
         Init();
 
         Create(listCtrl, id);
     }

+#endif

 
 

-    ~wxDragImage();
+    virtual ~wxDragImage();

 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////


@@ -200,15 +202,19 @@ public:
         return Create(str, cursor);
     }
 
         return Create(str, cursor);
     }
 

+#if wxUSE_TREECTRL

     // Create a drag image for the given tree control item
     bool Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id);
     // Create a drag image for the given tree control item
     bool Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id);

+#endif

 
 

+#if wxUSE_LISTCTRL

     // Create a drag image for the given list control item
     bool Create(const wxListCtrl& listCtrl, long id);
     // Create a drag image for the given list control item
     bool Create(const wxListCtrl& listCtrl, long id);

+#endif

 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.

-    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = FALSE, wxRect* rect = (wxRect*) NULL);
+    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = NULL);

 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the


@@ -260,8 +266,9 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)

-    DECLARE_NO_COPY_CLASS(wxDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxDragImage);

 };
 
 };
 

+#endif // wxUSE_DRAGIMAGE

 #endif
     // _WX_DRAGIMAG_H_
 #endif
     // _WX_DRAGIMAG_H_