Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv27131/src/gui
Modified Files:
wxIconManager.cpp
Log Message:
use wxHAS_ICON_LOCATION instead of version check
Index: wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -b -u -2 -r1.95 -r1.96
--- wxIconManager.cpp 10 Jul 2003 18:31:40 -0000 1.95
+++ wxIconManager.cpp 13 Jul 2003 21:21:22 -0000 1.96
@@ -632,5 +632,5 @@
wxFileType *fileType = mimeManager.GetFileTypeFromMimeType(type);
if ( fileType != NULL ) {
-#if wxCHECK_VERSION(2, 5, 0)
+#ifdef wxHAS_ICON_LOCATION
wxIconLocation iconLoc;
if ( fileType->GetIcon(&iconLoc) )
@@ -638,5 +638,5 @@
icon = wxIcon(iconLoc);
}
-#else // wx 2.4.x
+#else // wx 2.4.x or very early 2.5.0
(void)fileType->GetIcon(&icon);
#endif
@@ -664,5 +664,5 @@
if ( fileType )
{
-#if wxCHECK_VERSION(2, 5, 0)
+#ifdef wxHAS_ICON_LOCATION
wxIconLocation iconLoc;
if ( fileType->GetIcon(&iconLoc) )
@@ -670,5 +670,5 @@
icon = wxIcon(iconLoc);
}
-#else // wx 2.4.x
+#else // wx 2.4.x or very early 2.5.0
(void)fileType->GetIcon(&icon);
#endif
-------------------------------------------------------
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
