missing commit

[wxWidgets.git] / src / msw / dragimag.cpp

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 0789752ef0613378373fcdb9bcaaa6897cfe7dd2..067d67608df63d181fedcc7ef80f9412582861e5 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dragimag.cpp
+// Name:        src/msw/dragimag.cpp

 // Purpose:     wxDragImage
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxDragImage
 // Author:      Julian Smart
 // Modified by:


@@ -17,36 +17,30 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dragimag.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_DRAGIMAGE
 
 #endif
 
 #if wxUSE_DRAGIMAGE
 

-#if defined(__WIN95__)
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/window.h"
-#include "wx/dcclient.h"
-#include "wx/dcscreen.h"
-#include "wx/dcmemory.h"
-#include "wx/settings.h"
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include <stdio.h>
+    #include "wx/window.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcscreen.h"
+    #include "wx/dcmemory.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/frame.h"
+    #include "wx/image.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/frame.h"
-#include "wx/image.h"

 
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"


@@ -55,10 +49,6 @@
 #include "wx/msw/wince/missing.h"
 #endif // __WXWINCE__
 
 #include "wx/msw/wince/missing.h"
 #endif // __WXWINCE__
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-#include <commctrl.h>
-#endif
-

 // Wine doesn't have this yet
 #ifndef ListView_CreateDragImage
 #define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \
 // Wine doesn't have this yet
 #ifndef ListView_CreateDragImage
 #define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \


@@ -102,10 +92,48 @@ void wxDragImage::Init()
 #if !wxUSE_SIMPLER_DRAGIMAGE
     m_hCursorImageList = 0;
 #endif
 #if !wxUSE_SIMPLER_DRAGIMAGE
     m_hCursorImageList = 0;
 #endif

-    m_window = (wxWindow*) NULL;
-    m_fullScreen = FALSE;
+    m_window = NULL;
+    m_fullScreen = false;
+}
+
+#if WXWIN_COMPATIBILITY_2_8
+wxDragImage::wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+{
+    Init();
+
+    Create(image, cursor);
+}
+
+wxDragImage::wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+{
+    Init();
+
+    Create(image, cursor);
+}
+
+wxDragImage::wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+{
+    Init();
+
+    Create(str, cursor);
+}
+
+bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+{
+    return Create(image, cursor);

 }
 
 }
 

+bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+{
+    return Create(image, cursor);
+}
+
+bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+{
+    return Create(str, cursor);
+}
+#endif // WXWIN_COMPATIBILITY_2_8
+

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


@@ -120,10 +148,10 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor)
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 

-    UINT flags = 0 ;

 #ifdef __WXWINCE__
 #ifdef __WXWINCE__

-    flags = ILC_COLOR;
+    UINT flags = ILC_COLOR;

 #else
 #else

+    UINT flags wxDUMMY_INITIALIZE(0) ;

     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)
     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)


@@ -177,10 +205,10 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 
         ImageList_Destroy(GetHimageList());
     m_hImageList = 0;
 

-    UINT flags = 0 ;

 #ifdef __WXWINCE__
 #ifdef __WXWINCE__

-    flags = ILC_COLOR;
+    UINT flags = ILC_COLOR;

 #else
 #else

+    UINT flags wxDUMMY_INITIALIZE(0) ;

     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)
     if (image.GetDepth() <= 4)
         flags = ILC_COLOR4;
     else if (image.GetDepth() <= 8)


@@ -192,9 +220,8 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
     else
         flags = ILC_COLOR32;
 #endif
     else
         flags = ILC_COLOR32;
 #endif

-    bool mask = TRUE;
-    if ( mask )
-        flags |= ILC_MASK;
+
+    flags |= ILC_MASK;

 
     m_hImageList = (WXHIMAGELIST) ImageList_Create(image.GetWidth(), image.GetHeight(), flags, 1, 1);
 
 
     m_hImageList = (WXHIMAGELIST) ImageList_Create(image.GetWidth(), image.GetHeight(), flags, 1, 1);
 


@@ -216,7 +243,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 {
     wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
 {
     wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

-    long w, h;
+    wxCoord w = 0, h = 0;

     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);
     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);


@@ -229,7 +256,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 
     dc2.SetBackground(* wxWHITE_BRUSH);
     dc2.Clear();
 
     dc2.SetBackground(* wxWHITE_BRUSH);
     dc2.Clear();

-    dc2.SetBackgroundMode(wxTRANSPARENT);
+    dc2.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

     dc2.SetTextForeground(* wxLIGHT_GREY);
     dc2.DrawText(str, 0, 0);
     dc2.DrawText(str, 1, 0);
     dc2.SetTextForeground(* wxLIGHT_GREY);
     dc2.DrawText(str, 0, 0);
     dc2.DrawText(str, 1, 0);


@@ -243,10 +270,14 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 
     dc2.SelectObject(wxNullBitmap);
 
 
     dc2.SelectObject(wxNullBitmap);
 

+#if wxUSE_WXDIB

     // Make the bitmap masked
     wxImage image = bitmap.ConvertToImage();
     image.SetMaskColour(255, 255, 255);
     return Create(wxBitmap(image), cursor);
     // Make the bitmap masked
     wxImage image = bitmap.ConvertToImage();
     image.SetMaskColour(255, 255, 255);
     return Create(wxBitmap(image), cursor);

+#else
+    return false;
+#endif

 }
 
 #if wxUSE_TREECTRL
 }
 
 #if wxUSE_TREECTRL


@@ -257,7 +288,13 @@ bool wxDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
         ImageList_Destroy(GetHimageList());
     m_hImageList = (WXHIMAGELIST)
         TreeView_CreateDragImage(GetHwndOf(&treeCtrl), (HTREEITEM) id.m_pItem);
         ImageList_Destroy(GetHimageList());
     m_hImageList = (WXHIMAGELIST)
         TreeView_CreateDragImage(GetHwndOf(&treeCtrl), (HTREEITEM) id.m_pItem);

-    return m_hImageList != 0;
+    if ( !m_hImageList )
+    {
+        // fall back on just the item text if there is no image
+        return Create(treeCtrl.GetItemText(id));
+    }
+
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -268,9 +305,18 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id)
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
     POINT pt;
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
     POINT pt;

-    pt.x = 0; pt.y = 0;
-    m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt);
-    return TRUE;
+    pt.x =
+    pt.y = 0;
+    m_hImageList = (WXHIMAGELIST)
+        ListView_CreateDragImage(GetHwndOf(&listCtrl), id, &pt);
+
+    if ( !m_hImageList )
+    {
+        // as for wxTreeCtrl, fall back on dragging just the item text
+        return Create(listCtrl.GetItemText(id));
+    }
+
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -288,22 +334,27 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
 
     if (!ret)
     {
 
     if (!ret)
     {

-        wxFAIL_MSG( _T("BeginDrag failed.") );
+        wxFAIL_MSG( wxT("BeginDrag failed.") );

 
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    if (m_cursor.Ok())
+    if (m_cursor.IsOk())

     {
 #if wxUSE_SIMPLER_DRAGIMAGE
     {
 #if wxUSE_SIMPLER_DRAGIMAGE

-           m_oldCursor = window->GetCursor();
-           window->SetCursor(m_cursor);
+        m_oldCursor = window->GetCursor();
+        window->SetCursor(m_cursor);

 #else
         if (!m_hCursorImageList)
 #else
         if (!m_hCursorImageList)

-        {           
-            int cxCursor = GetSystemMetrics(SM_CXCURSOR); 
-            int cyCursor = GetSystemMetrics(SM_CYCURSOR); 
- 
+        {
+#ifndef SM_CXCURSOR
+            // Smartphone may not have these metric symbol
+            int cxCursor = 16;
+            int cyCursor = 16;
+#else
+            int cxCursor = ::GetSystemMetrics(SM_CXCURSOR);
+            int cyCursor = ::GetSystemMetrics(SM_CYCURSOR);
+#endif

             m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1);
         }
 
             m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1);
         }
 


@@ -339,7 +390,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
     }
 
 #if !wxUSE_SIMPLER_DRAGIMAGE
     }
 
 #if !wxUSE_SIMPLER_DRAGIMAGE

-    if (m_cursor.Ok())
+    if (m_cursor.IsOk())

         ::ShowCursor(FALSE);
 #endif
 
         ::ShowCursor(FALSE);
 #endif
 


@@ -347,7 +398,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
 
     ::SetCapture(GetHwndOf(window));
 
 
     ::SetCapture(GetHwndOf(window));
 

-    return TRUE;
+    return true;

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


@@ -359,16 +410,16 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow*
 
     int x = fullScreenRect->GetPosition().x;
     int y = fullScreenRect->GetPosition().y;
 
     int x = fullScreenRect->GetPosition().x;
     int y = fullScreenRect->GetPosition().y;

-    
+

     wxSize sz = fullScreenRect->GetSize();
 
     wxSize sz = fullScreenRect->GetSize();
 

-    if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
+    if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame))

         fullScreenRect->GetParent()->ClientToScreen(& x, & y);
 
     rect.x = x; rect.y = y;
     rect.width = sz.x; rect.height = sz.y;
 
         fullScreenRect->GetParent()->ClientToScreen(& x, & y);
 
     rect.x = x; rect.y = y;
     rect.width = sz.x; rect.height = sz.y;
 

-    return BeginDrag(hotspot, window, TRUE, & rect);
+    return BeginDrag(hotspot, window, true, & rect);

 }
 
 // End drag
 }
 
 // End drag


@@ -384,15 +435,15 @@ bool wxDragImage::EndDrag()
     }
 
 #if wxUSE_SIMPLER_DRAGIMAGE
     }
 
 #if wxUSE_SIMPLER_DRAGIMAGE

-    if (m_cursor.Ok() && m_oldCursor.Ok())
-           m_window->SetCursor(m_oldCursor);
+    if (m_cursor.IsOk() && m_oldCursor.IsOk())
+        m_window->SetCursor(m_oldCursor);

 #else
     ::ShowCursor(TRUE);
 #endif
 
 #else
     ::ShowCursor(TRUE);
 #endif
 

-    m_window = (wxWindow*) NULL;
+    m_window = NULL;

 
 

-    return TRUE;
+    return true;

 }
 
 // Move the image: call from OnMouseMove. Pt is in window client coordinates if window
 }
 
 // Move the image: call from OnMouseMove. Pt is in window client coordinates if window


@@ -457,7 +508,4 @@ bool wxDragImage::Hide()
     return ret;
 }
 
     return ret;
 }
 

-#endif
-    // __WIN95__
-

 #endif // wxUSE_DRAGIMAGE
 #endif // wxUSE_DRAGIMAGE