Opened 5 years ago

Closed 5 years ago

#10280 closed Bug report (fixed)

Missing wx header with disable-manualupdatecheck

Reported by: Corrado Franco Owned by:
Priority: normal Component: FileZilla Client
Keywords: interface, wx, header Cc:
Component version: Operating system type: Linux
Operating system version: Slackware current

Description

With option --disable-manualupdatecheck there is error wxTimerEvent not declared in Mainfrm.h
I saw that the file call updater.h on the value of the variable FZ_MANUALUPDATECHECK

 #if FZ_MANUALUPDATECHECK
 #include "updater.h"
 #endif

This file by making a check on the same variable includes the file wx/timer.h

Then I added an else to control the variable

 #if FZ_MANUALUPDATECHECK
 #include "updater.h"
 #else
 #include "wx/timer.h"
 #endif

and build is ok.

I do not know if it is the best choice.

I'm sorry for my bad english.


I applied this patch, and it's ok
--- filezilla-3.10.2-orig/src/interface/Mainfrm.h 2014-12-28 18:48:10.000000000 +0100
+++ filezilla-3.10.2/src/interface/Mainfrm.h 2015-03-03 16:14:02.441945287 +0100
@@ -28,6 +28,8 @@ class CWindowStateManager;

#if FZ_MANUALUPDATECHECK
#include "updater.h"

+#else
+#include "wx/timer.h"

#endif
class CWindowStateManager;

Attachments (1)

filezilla-wxtimer.patch (330 bytes ) - added by Corrado Franco 5 years ago.
Patch for wxtimer header

Download all attachments as: .zip

Change History (2)

by Corrado Franco, 5 years ago

Attachment: filezilla-wxtimer.patch added

Patch for wxtimer header

comment:1 by Tim Kosse, 5 years ago

Resolution: fixed
Status: newclosed

Thanks, I've committed a fix.

Note: See TracTickets for help on using tickets.