#if wxUSE_DRAGIMAGE
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include <stdio.h>
#include "wx/window.h"
#include "wx/dcclient.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/image.h"
#include "wx/msw/dragimag.h"
#include "wx/msw/private.h"
#include "wx/msw/wince/missing.h"
#endif // __WXWINCE__
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
// Wine doesn't have this yet
#ifndef ListView_CreateDragImage
#define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \
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);
{
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);
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);