move parsing helpers, too (part of r59656)

[wxWidgets.git] / src / msw / dragimag.cpp

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 2cb08d63d31c44396e6837fd2026c7cfe4b969da..d3c7c649e9229053b020a92372759c0bd75451e4 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -92,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;
 }
 


@@ -205,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);


@@ -218,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(wxBRUSHSTYLE_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);


@@ -388,7 +388,7 @@ bool wxDragImage::EndDrag()
     ::ShowCursor(TRUE);
 #endif
 
     ::ShowCursor(TRUE);
 #endif
 

-    m_window = (wxWindow*) NULL;
+    m_window = NULL;

 
     return true;
 }
 
     return true;
 }