projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't overwrite status message when restoring it if it changed.
[wxWidgets.git]
/
src
/
msw
/
dragimag.cpp
diff --git
a/src/msw/dragimag.cpp
b/src/msw/dragimag.cpp
index 75d271d05c8c51fbdbebb3c57ae9632f3d93abfb..bed8aea3fe8932f1f585ada291ac75a4c57cf9a8 100644
(file)
--- a/
src/msw/dragimag.cpp
+++ b/
src/msw/dragimag.cpp
@@
-27,6
+27,7
@@
#if wxUSE_DRAGIMAGE
#ifndef WX_PRECOMP
#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 <stdio.h>
#include "wx/window.h"
#include "wx/dcclient.h"
@@
-36,10
+37,10
@@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/frame.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/image.h"
#include "wx/msw/dragimag.h"
#include "wx/msw/private.h"
#include "wx/msw/dragimag.h"
#include "wx/msw/private.h"
@@
-48,9
+49,6
@@
#include "wx/msw/wince/missing.h"
#endif // __WXWINCE__
#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) \
// 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
#if !wxUSE_SIMPLER_DRAGIMAGE
m_hCursorImageList = 0;
#endif
- m_window =
(wxWindow*)
NULL;
+ m_window = NULL;
m_fullScreen = false;
}
m_fullScreen = false;
}
@@
-184,9
+182,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);
@@
-208,7
+205,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 = 0, h = 0;
+
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);
@@
-221,7
+218,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(wx
BRUSHSTYLE_
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);
@@
-284,7
+281,7
@@
bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
if (!ret)
{
if (!ret)
{
- wxFAIL_MSG(
_
T("BeginDrag failed.") );
+ wxFAIL_MSG(
wx
T("BeginDrag failed.") );
return false;
}
return false;
}
@@
-391,7
+388,7
@@
bool wxDragImage::EndDrag()
::ShowCursor(TRUE);
#endif
::ShowCursor(TRUE);
#endif
- m_window =
(wxWindow*)
NULL;
+ m_window = NULL;
return true;
}
return true;
}