Speed fix for wxGenericDirCtrl, starting to add text input control;

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

diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index a7a1fd0988214e720315a734d3c42bdcbe732e7c..12281325144399218733d94a1ad26cf9726d20fc 100644 (file)
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dragimag.h
+// Name:        wx/msw/dragimag.h
 // Purpose:     wxDragImage class: a kind of a cursor, that can cope
 //              with more sophisticated images
 // Author:      Julian Smart
@@ -7,7 +7,7 @@
 // Created:     08/04/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DRAGIMAG_H_
@@ -100,52 +100,56 @@
 
 class WXDLLEXPORT wxDragImage: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxDragImage)
 public:
-    
+
     // Ctors & dtor
     ////////////////////////////////////////////////////////////////////////////
 
     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))
     {
-        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))
     {
-        m_hImageList = 0;
-        Create(str, cursor);
+        Init();
+
+        Create(str, cursor, hotspot);
     }
     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {
-        m_hImageList = 0;
+        Init();
+
         Create(treeCtrl, id);
     }
     wxDragImage(const wxListCtrl& listCtrl, long id)
     {
-        m_hImageList = 0;
+        Init();
+
         Create(listCtrl, id);
     }
     ~wxDragImage();
-    
+
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
-    
+
     // Operations
     ////////////////////////////////////////////////////////////////////////////
-    
+
     // Create a drag image from a bitmap and optional cursor
     bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0));
-    
+
     // Create a drag image from an icon and optional cursor
     bool Create(const wxIcon& image, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0));
-    
+
     // Create a drag image from a string and optional cursor
     bool Create(const wxString& str, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0));
 
@@ -157,32 +161,50 @@ public:
 
     // 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
-    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.
-    bool Move(const wxPoint& pt, wxWindow* window);
+    bool Move(const wxPoint& pt);
 
     // Show the image
-    bool Show(wxWindow* window);
+    bool Show();
 
     // Hide the image
-    bool Hide(wxWindow* window);
-    
+    bool Hide();
+
     // Implementation
     ////////////////////////////////////////////////////////////////////////////
-    
+
+    // Initialize variables
+    void Init();
+
     // Returns the native image list handle
-    inline WXHIMAGELIST GetHIMAGELIST() const { return m_hImageList; }
-    
+    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;
+    WXHIMAGELIST    m_hCursorImageList;
     wxCursor        m_cursor;
     wxPoint         m_hotspot;
     wxPoint         m_position;
+    wxWindow*       m_window;
+    wxRect          m_boundingRect;
+    bool            m_fullScreen;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxDragImage)
 };
 
 #endif