Some code tidying; removing dibutils.cpp which

doesn't seem to be used any more


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/gdiimage.cpp

@@ -494,6 +494,16 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     HICON hicon = ReadIconFile((wxChar *)name.c_str(),
                                wxGetInstance(),
                                &size.x, &size.y);
+    HICON   hIcon = 0;
+    HANDLE  hDIB = 0;
+
+    // Read the icon DIB from file
+    if( (hDIB = ReadIcon((wxChar *)name.c_str(), &size.x, &size.y)) == (HANDLE) NULL)
+        return false;
+
+    // Create an icon from DIB
+    hicon = MakeIcon( hDIB, wxGetInstance());
+    GlobalFree( hDIB);
 #endif // Win32/Win16
 
     if ( (desiredWidth != -1 && desiredWidth != size.x) ||