/////////////////////////////////////////////////////////////////////////////
-// Name: dragimag.cpp
+// Name: src/msw/dragimag.cpp
// Purpose: wxDragImage
// Author: Julian Smart
// Modified by:
// 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__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_DRAGIMAGE
-#if defined(__WIN95__)
-
#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 <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"
#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/wince/missing.h"
#endif // __WXWINCE__
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-#include <commctrl.h>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
// Wine doesn't have this yet
#ifndef ListView_CreateDragImage
m_hCursorImageList = 0;
#endif
m_window = (wxWindow*) NULL;
- m_fullScreen = FALSE;
+ m_fullScreen = false;
}
// Attributes
ImageList_Destroy(GetHimageList());
m_hImageList = 0;
- UINT flags = 0 ;
#ifdef __WXWINCE__
- flags = ILC_COLOR;
+ UINT flags = ILC_COLOR;
#else
+ UINT flags wxDUMMY_INITIALIZE(0) ;
if (image.GetDepth() <= 4)
flags = ILC_COLOR4;
else if (image.GetDepth() <= 8)
ImageList_Destroy(GetHimageList());
m_hImageList = 0;
- UINT flags = 0 ;
#ifdef __WXWINCE__
- flags = ILC_COLOR;
+ UINT flags = ILC_COLOR;
#else
+ UINT flags wxDUMMY_INITIALIZE(0) ;
if (image.GetDepth() <= 4)
flags = ILC_COLOR4;
else if (image.GetDepth() <= 8)
else
flags = ILC_COLOR32;
#endif
- bool mask = TRUE;
+ bool mask = true;
if ( mask )
flags |= ILC_MASK;
{
wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- long w, h;
+ long w = 0, h = 0;
wxScreenDC dc;
dc.SetFont(font);
dc.GetTextExtent(str, & w, & h);
dc2.SelectObject(wxNullBitmap);
+#if wxUSE_WXDIB
// 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
POINT pt;
pt.x = 0; pt.y = 0;
m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt);
- return TRUE;
+ return true;
}
#endif
{
wxFAIL_MSG( _T("BeginDrag failed.") );
- return FALSE;
+ return false;
}
if (m_cursor.Ok())
{
#if wxUSE_SIMPLER_DRAGIMAGE
- m_oldCursor = window->GetCursor();
- window->SetCursor(m_cursor);
+ m_oldCursor = window->GetCursor();
+ window->SetCursor(m_cursor);
#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);
}
::SetCapture(GetHwndOf(window));
- return TRUE;
+ return true;
}
// Begin drag. hotspot is the location of the drag position relative to the upper-left
int x = fullScreenRect->GetPosition().x;
int y = fullScreenRect->GetPosition().y;
-
+
wxSize sz = fullScreenRect->GetSize();
if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
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
#if wxUSE_SIMPLER_DRAGIMAGE
if (m_cursor.Ok() && m_oldCursor.Ok())
- m_window->SetCursor(m_oldCursor);
+ m_window->SetCursor(m_oldCursor);
#else
::ShowCursor(TRUE);
#endif
m_window = (wxWindow*) NULL;
- return TRUE;
+ return true;
}
// Move the image: call from OnMouseMove. Pt is in window client coordinates if window
return ret;
}
-#endif
- // __WIN95__
-
#endif // wxUSE_DRAGIMAGE