projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reset g_lastMouseEvent after processing the mouse button release event
[wxWidgets.git]
/
src
/
msw
/
icon.cpp
diff --git
a/src/msw/icon.cpp
b/src/msw/icon.cpp
index e0fa3ee5106a639595137bd26d507002a18bd49d..ebf8f49d986406df0624544bf5c33defb8b710cb 100644
(file)
--- a/
src/msw/icon.cpp
+++ b/
src/msw/icon.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/icon.cpp
+// Name:
src/
msw/icon.cpp
// Purpose: wxIcon class
// Author: Julian Smart
// Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
// Purpose: wxIcon class
// Author: Julian Smart
// Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
@@
-25,7
+25,6
@@
#endif
#ifndef WX_PRECOMP
#endif
#ifndef WX_PRECOMP
- #include "wx/defs.h"
#include "wx/list.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/list.h"
#include "wx/utils.h"
#include "wx/app.h"
@@
-145,10
+144,15
@@
bool wxIcon::LoadFile(const wxString& filename,
if ( !handler )
{
if ( !handler )
{
- // say something?
- return false;
+ // load via wxBitmap which, in turn, uses wxImage allowing us to
+ // support more formats
+ wxBitmap bmp;
+ if ( !bmp.LoadFile(filename, type) )
+ return false;
+
+ CopyFromBitmap(bmp);
+ return true;
}
return handler->Load(this, filename, type, desiredWidth, desiredHeight);
}
}
return handler->Load(this, filename, type, desiredWidth, desiredHeight);
}
-