applied patch 411059 (mingw win32 api version check)

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

diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index ac37bff488ef9dd6e29e5ab47297883776217f66..12281325144399218733d94a1ad26cf9726d20fc 100644 (file)
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -108,27 +108,32 @@ public:
     wxDragImage();
     wxDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
     {
     wxDragImage();
     wxDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
     {

-        m_hImageList = 0;
-        Create(image, cursor);
+        Init();
+
+        Create(image, cursor, hotspot);

     }
     wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
     {
     }
     wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
     {

-        m_hImageList = 0;
-        Create(image, cursor);
+        Init();
+
+        Create(image, cursor, hotspot);

     }
     wxDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
     {
     }
     wxDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
     {

-        m_hImageList = 0;
-        Create(str, cursor);
+        Init();
+
+        Create(str, cursor, hotspot);

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

-        m_hImageList = 0;
+        Init();
+

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

-        m_hImageList = 0;
+        Init();
+

         Create(listCtrl, id);
     }
     ~wxDragImage();
         Create(listCtrl, id);
     }
     ~wxDragImage();


@@ -156,32 +161,47 @@ public:
 
     // 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 BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = FALSE, wxRect* rect = (wxRect*) 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
+    // position of the window on the screen, to restrict the drag to.
+    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow* fullScreenRect);

 
     // End drag
 
     // End drag

-    bool EndDrag(wxWindow* window);
+    bool EndDrag();

 
     // Move the image: call from OnMouseMove. Pt is in window client coordinates if window
     // is non-NULL, or in screen coordinates if NULL.
 
     // Move the image: call from OnMouseMove. Pt is in window client coordinates if window
     // is non-NULL, or in screen coordinates if NULL.

-    bool Move(const wxPoint& pt, wxWindow* window);
+    bool Move(const wxPoint& pt);

 
     // Show the image
 
     // Show the image

-    bool Show(wxWindow* window);
+    bool Show();

 
     // Hide the image
 
     // Hide the image

-    bool Hide(wxWindow* window);
+    bool Hide();

 
     // Implementation
     ////////////////////////////////////////////////////////////////////////////
 
 
     // Implementation
     ////////////////////////////////////////////////////////////////////////////
 

+    // Initialize variables
+    void Init();
+

     // Returns the native image list handle
     WXHIMAGELIST GetHIMAGELIST() const { return m_hImageList; }
 
     // Returns the native image list handle
     WXHIMAGELIST GetHIMAGELIST() const { return m_hImageList; }
 

+    // Returns the native image list handle for the cursor
+    WXHIMAGELIST GetCursorHIMAGELIST() const { return m_hCursorImageList; }
+

 protected:
     WXHIMAGELIST    m_hImageList;
 protected:
     WXHIMAGELIST    m_hImageList;

+    WXHIMAGELIST    m_hCursorImageList;

     wxCursor        m_cursor;
     wxPoint         m_hotspot;
     wxPoint         m_position;
     wxCursor        m_cursor;
     wxPoint         m_hotspot;
     wxPoint         m_position;

+    wxWindow*       m_window;
+    wxRect          m_boundingRect;
+    bool            m_fullScreen;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)