On Tue, 8 Jul 2003 18:20:34 +0300 (EEST) Nerijus Baliunas <[EMAIL PROTECTED]> wrote:
> On Mon, 7 Jul 2003 20:11:23 +0200 (CEST) Robert Vazan
> <[EMAIL PROTECTED]> wrote:
>
> RV> > > Right now it should build except for one small problem with
> RV> > GetFileIcon().
> RV> > >
> RV> > That's the one. I didn't investigate. I thought it was a wx update
> RV> > problem
> RV>
> RV> Me too. Vadim, why do we have broken build for over one week?
> RV>
> RV> c++ -o gui/wxIconManager.o -c
>
> RV> src/gui/wxIconManager.cpp:656: `wxIconLocation' undeclared (first use
>
> I probably fixed it. Please add #include <wx/iconloc.h> if anon cvs
> doesn't
> update soon.
I've got errors despite that. Here's patch that I applied to make this
file compile. Unfortunately I had to drop from wxWindows 2.5 to stable
anyway because of errors related to dynamic arrays.
Index: src/gui/wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.94
diff -u -2 -r1.94 wxIconManager.cpp
--- src/gui/wxIconManager.cpp 8 Jul 2003 15:21:05 -0000 1.94
+++ src/gui/wxIconManager.cpp 10 Jul 2003 11:36:36 -0000
@@ -37,5 +37,7 @@
#include <wx/mimetype.h>
#include <wx/file.h>
+#if wxCHECK_VERSION(2, 5, 0)
#include <wx/iconloc.h>
+#endif
#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/bulletproofapps
_______________________________________________
Mahogany-Developers mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-developers
