removed useless colMapAllocCounter (patch 1413456)

[wxWidgets.git] / src / generic / dragimgg.cpp

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 00433a6df6f947930600d17a18daa3dbcb31bb14..fd104aad66361fae2fb81d6e402991f039f06cb4 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dragimgg.cpp
+// Name:        src/generic/dragimgg.cpp

 // Purpose:     Generic wxDragImage implementation
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Generic wxDragImage implementation
 // Author:      Julian Smart
 // Modified by:


@@ -28,7 +28,6 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
 
 #ifndef WX_PRECOMP
 #include <stdio.h>

-#include "wx/setup.h"

 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/dcclient.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/dcclient.h"


@@ -124,7 +123,7 @@ bool wxGenericDragImage::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, h;
+    long w = 0, h = 0;

     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);
     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);