Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index d76a95a9b3f360bd17545717cf6af5c128cf019b..e08723511a3f8816700429eb6def54cd4ae5abea 100644 (file)
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     08/04/99
 // Author:      Julian Smart
 // Modified by:
 // Created:     08/04/99

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,6 +12,8 @@
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 

+#if wxUSE_DRAGIMAGE
+

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


@@ -97,7 +98,7 @@
  * wxDragImage
  */
 
  * wxDragImage
  */
 

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

 {
 public:
 
 {
 public:
 


@@ -112,14 +113,6 @@ public:
         Create(image, cursor);
     }
 
         Create(image, cursor);
     }
 

-    // Deprecated form of the above
-    wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(image, cursor, cursorHotspot);
-    }
-

     wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor)
     {
         Init();
     wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor)
     {
         Init();


@@ -127,14 +120,6 @@ public:
         Create(image, cursor);
     }
 
         Create(image, cursor);
     }
 

-    // Deprecated form of the above
-    wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(image, cursor, cursorHotspot);
-    }
-

     wxDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor)
     {
         Init();
     wxDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor)
     {
         Init();


@@ -142,14 +127,6 @@ public:
         Create(str, cursor);
     }
 
         Create(str, cursor);
     }
 

-    // Deprecated form of the above
-    wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(str, cursor, cursorHotspot);
-    }
-

 #if wxUSE_TREECTRL
     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {
 #if wxUSE_TREECTRL
     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {


@@ -178,27 +155,12 @@ public:
 
     // Create a drag image from a bitmap and optional cursor
     bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor);
 
     // Create a drag image from a bitmap and optional cursor
     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
     bool Create(const wxIcon& image, const wxCursor& cursor = wxNullCursor);
 
     // Create a drag image from an icon and optional cursor
     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
     bool Create(const wxString& str, const wxCursor& cursor = wxNullCursor);
 
     // Create a drag image from a string and optional cursor
     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);
-    }

 
 #if wxUSE_TREECTRL
     // Create a drag image for the given tree control item
 
 #if wxUSE_TREECTRL
     // Create a drag image for the given tree control item


@@ -212,7 +174,7 @@ 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 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


@@ -246,6 +208,16 @@ public:
     WXHIMAGELIST GetCursorHIMAGELIST() const { return m_hCursorImageList; }
 #endif
 
     WXHIMAGELIST GetCursorHIMAGELIST() const { return m_hCursorImageList; }
 #endif
 

+    // don't use in new code, use versions without hot spot parameter
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+#endif // WXWIN_COMPATIBILITY_2_8
+

 protected:
     WXHIMAGELIST    m_hImageList;
 
 protected:
     WXHIMAGELIST    m_hImageList;
 


@@ -264,8 +236,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_