Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

[wxWidgets.git] / include / wx / generic / dragimgg.h

diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 53830a504cb6233327bceb99a1042b14a3440448..cbfa4afb43ce4ab9f91d7580ab086c3b5999a1bf 100644 (file)
--- a/include/wx/generic/dragimgg.h
+++ b/include/wx/generic/dragimgg.h
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////

 // Name:        wx/generic/dragimgg.h
 // Purpose:     wxDragImage class: a kind of a cursor, that can cope
 //              with more sophisticated images
 // Name:        wx/generic/dragimgg.h
 // Purpose:     wxDragImage class: a kind of a cursor, that can cope
 //              with more sophisticated images


@@ -13,7 +13,7 @@
 #ifndef _WX_DRAGIMGG_H_
 #define _WX_DRAGIMGG_H_
 
 #ifndef _WX_DRAGIMGG_H_
 #define _WX_DRAGIMGG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "dragimgg.h"
 #endif
 
 #pragma interface "dragimgg.h"
 #endif
 


@@ -22,6 +22,7 @@
 #include "wx/cursor.h"
 #include "wx/treectrl.h"
 #include "wx/listctrl.h"
 #include "wx/cursor.h"
 #include "wx/treectrl.h"
 #include "wx/listctrl.h"

+#include "wx/log.h"

 
 /*
   To use this class, create a wxDragImage when you start dragging, for example:
 
 /*
   To use this class, create a wxDragImage when you start dragging, for example:


@@ -97,35 +98,71 @@ public:
     // Ctors & dtor
     ////////////////////////////////////////////////////////////////////////////
 
     // Ctors & dtor
     ////////////////////////////////////////////////////////////////////////////
 

-    wxGenericDragImage(const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
+    wxGenericDragImage(const wxCursor& cursor = wxNullCursor)

     {
         Init();
     {
         Init();

-        Create(cursor, hotspot);
+        Create(cursor);

     }
     }

-    wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
+
+    // Deprecated version of the above
+    wxGenericDragImage(const wxCursor& cursor, const wxPoint& cursorHotspot)

     {
         Init();
     {
         Init();

+        Create(cursor, cursorHotspot);
+    }

 
 

-        Create(image, cursor, hotspot);
+    wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor)
+    {
+        Init();
+
+        Create(image, cursor);

     }
     }

-    wxGenericDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
+
+    // Deprecated version of the above
+    wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot)

     {
         Init();
 
     {
         Init();
 

-        Create(image, cursor, hotspot);
+        Create(image, cursor, cursorHotspot);

     }
     }

-    wxGenericDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0))
+
+    wxGenericDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor)

     {
         Init();
 
     {
         Init();
 

-        Create(str, cursor, hotspot);
+        Create(image, cursor);

     }
     }

+
+    // Deprecated version of the above
+    wxGenericDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
+    {
+        Init();
+
+        Create(image, cursor, cursorHotspot);
+    }
+
+    wxGenericDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor)
+    {
+        Init();
+
+        Create(str, cursor);
+    }
+
+    // Deprecated version of the above
+    wxGenericDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot)
+    {
+        Init();
+
+        Create(str, cursor, cursorHotspot);
+    }
+

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

+

     wxGenericDragImage(const wxListCtrl& listCtrl, long id)
     {
         Init();
     wxGenericDragImage(const wxListCtrl& listCtrl, long id)
     {
         Init();


@@ -145,16 +182,36 @@ public:
     ////////////////////////////////////////////////////////////////////////////
 
     // Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect)
     ////////////////////////////////////////////////////////////////////////////
 
     // Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect)

-    bool Create(const wxCursor& cursor = wxNullCursor, const wxPoint& hotspot = wxPoint(0, 0));
+    bool Create(const wxCursor& cursor = wxNullCursor);
+    bool Create(const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+    {
+        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
+        return Create(cursor);
+    }

 
     // Create a drag image from a bitmap and optional cursor
 
     // 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));
+    bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor);
+    bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+    {
+        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
+        return Create(image, cursor);
+    }

 
     // Create a drag image from an icon and optional cursor
 
     // 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));
+    bool Create(const wxIcon& image, const wxCursor& cursor = wxNullCursor);
+    bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+    {
+        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
+        return Create(image, cursor);
+    }

 
     // Create a drag image from a string and optional cursor
 
     // 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));
+    bool Create(const wxString& str, const wxCursor& cursor = wxNullCursor);
+    bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+    {
+        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
+        return Create(str, cursor);
+    }

 
     // 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);


@@ -211,7 +268,7 @@ protected:
     wxIcon          m_icon;
     wxCursor        m_cursor;
     wxCursor        m_oldCursor;
     wxIcon          m_icon;
     wxCursor        m_cursor;
     wxCursor        m_oldCursor;

-    wxPoint         m_hotspot;
+//    wxPoint         m_hotspot;

     wxPoint         m_offset; // The hostpot value passed to BeginDrag
     wxPoint         m_position;
     bool            m_isDirty;
     wxPoint         m_offset; // The hostpot value passed to BeginDrag
     wxPoint         m_position;
     bool            m_isDirty;


@@ -231,6 +288,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDragImage)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDragImage)

+    DECLARE_NO_COPY_CLASS(wxGenericDragImage)

 };
 
 #endif
 };
 
 #endif