Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv24020
Modified Files:
wxIconManager.cpp
Log Message:
fixed compilation with wx 2.5
Index: wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -b -u -2 -r1.94 -r1.95
--- wxIconManager.cpp 8 Jul 2003 15:21:05 -0000 1.94
+++ wxIconManager.cpp 10 Jul 2003 18:31:40 -0000 1.95
@@ -28,4 +28,7 @@
# include "PathFinder.h"
# include "MApplication.h"
+#if wxCHECK_VERSION(2, 5, 0)
+# include <wx/iconloc.h>
+#endif
#endif
@@ -37,5 +40,4 @@
#include <wx/mimetype.h>
#include <wx/file.h>
-#include <wx/iconloc.h>
#ifdef USE_ICONS_FROM_RESOURCES
@@ -630,5 +632,13 @@
wxFileType *fileType = mimeManager.GetFileTypeFromMimeType(type);
if ( fileType != NULL ) {
- fileType->GetIcon(&icon);
+#if wxCHECK_VERSION(2, 5, 0)
+ wxIconLocation iconLoc;
+ if ( fileType->GetIcon(&iconLoc) )
+ {
+ icon = wxIcon(iconLoc);
+ }
+#else // wx 2.4.x
+ (void)fileType->GetIcon(&icon);
+#endif
fileType->GetExtensions(exts);
delete fileType;
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
