X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d71cc120e315b27466cce577115b9bdf56b1ca55..2e98aa124386e26c78ca725430c0b0c692db9fc2:/src/msw/dragimag.cpp diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index 4dcd3e57f8..9249d8c35c 100644 --- 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: @@ -17,10 +17,6 @@ // 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" @@ -30,11 +26,8 @@ #if wxUSE_DRAGIMAGE -#if defined(__WIN95__) - #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/window.h" #include "wx/dcclient.h" #include "wx/dcscreen.h" @@ -55,9 +48,8 @@ #include "wx/msw/wince/missing.h" #endif // __WXWINCE__ -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) -#include -#endif +// include "properly" +#include "wx/msw/wrapcctl.h" // Wine doesn't have this yet #ifndef ListView_CreateDragImage @@ -216,7 +208,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) { 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); @@ -243,10 +235,14 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) 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 @@ -301,8 +297,8 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS #else if (!m_hCursorImageList) { - int cxCursor = GetSystemMetrics(SM_CXCURSOR); - int cyCursor = GetSystemMetrics(SM_CYCURSOR); + int cxCursor = ::GetSystemMetrics(SM_CXCURSOR); + int cyCursor = ::GetSystemMetrics(SM_CYCURSOR); m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1); } @@ -457,7 +453,4 @@ bool wxDragImage::Hide() return ret; } -#endif - // __WIN95__ - #endif // wxUSE_DRAGIMAGE