X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1dfa9eb8e1d31e514d52cb8dd7b27d03126dd33..69d31e313035d5e22d9400ec946f6007f710910c:/src/msw/dragimag.cpp?ds=inline diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index 95ce39da52..bed8aea3fe 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -21,25 +21,26 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_DRAGIMAGE #ifndef WX_PRECOMP -#include -#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 "properly" + #include + #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" -#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" @@ -48,9 +49,6 @@ #include "wx/msw/wince/missing.h" #endif // __WXWINCE__ -// include "properly" -#include "wx/msw/wrapcctl.h" - // Wine doesn't have this yet #ifndef ListView_CreateDragImage #define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \ @@ -94,7 +92,7 @@ void wxDragImage::Init() #if !wxUSE_SIMPLER_DRAGIMAGE m_hCursorImageList = 0; #endif - m_window = (wxWindow*) NULL; + m_window = NULL; m_fullScreen = false; } @@ -184,9 +182,8 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor) 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); @@ -208,7 +205,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) { wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - long w = 0, h = 0; + wxCoord w = 0, h = 0; wxScreenDC dc; dc.SetFont(font); dc.GetTextExtent(str, & w, & h); @@ -221,7 +218,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) 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); @@ -284,7 +281,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS if (!ret) { - wxFAIL_MSG( _T("BeginDrag failed.") ); + wxFAIL_MSG( wxT("BeginDrag failed.") ); return false; } @@ -298,8 +295,8 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS if (!m_hCursorImageList) { #ifndef SM_CXCURSOR - // Smartphone may not have these metric symbol - int cxCursor = 16; + // Smartphone may not have these metric symbol + int cxCursor = 16; int cyCursor = 16; #else int cxCursor = ::GetSystemMetrics(SM_CXCURSOR); @@ -391,7 +388,7 @@ bool wxDragImage::EndDrag() ::ShowCursor(TRUE); #endif - m_window = (wxWindow*) NULL; + m_window = NULL; return true; }