1 diff -uNr atmelwlandriver.orig/src/apps/fw-upgrade/FucdApp.cpp atmelwlandriver/src/apps/fw-upgrade/FucdApp.cpp
2 --- atmelwlandriver.orig/src/apps/fw-upgrade/FucdApp.cpp 2005-07-22 09:37:22.000000000 +0200
3 +++ atmelwlandriver/src/apps/fw-upgrade/FucdApp.cpp 2006-04-11 21:29:38.000000000 +0200
8 -void FucdFrame::OnRescan()
9 +void FucdFrame::OnRescan(wxCommandEvent &event)
11 wxChoice *devchoice = (wxChoice*)FindWindowById(ID_CH_DEVICES);
17 -void FucdFrame::OnUpgradeFW()
18 +void FucdFrame::OnUpgradeFW(wxCommandEvent &event)
21 gg_dload->SetValue(0); // Initialize GG
26 -void FucdFrame::OnBtFile()
27 +void FucdFrame::OnBtFile(wxCommandEvent &event)
29 wxString filename, fullpath;
30 wxFileDialog fwfd(this, _("Choose a firmware image"), wxT("../"), wxT(""),
31 diff -uNr atmelwlandriver.orig/src/apps/fw-upgrade/FucdApp.h atmelwlandriver/src/apps/fw-upgrade/FucdApp.h
32 --- atmelwlandriver.orig/src/apps/fw-upgrade/FucdApp.h 2005-07-22 09:37:22.000000000 +0200
33 +++ atmelwlandriver/src/apps/fw-upgrade/FucdApp.h 2006-04-11 21:28:30.000000000 +0200
37 FucdFrame(wxWindow* parent, wxWindowID id, const wxString &title);
40 + void OnUpgradeFW(wxCommandEvent &event);
41 + void OnBtFile(wxCommandEvent &event);
42 void OnTimer(wxTimerEvent &event);
43 void OnClose(wxCloseEvent &event);
44 void OnBtClose(wxCommandEvent &event);
45 void OnSelectDevice(wxCommandEvent &event);
47 + void OnRescan(wxCommandEvent &event);
48 void OnIdle(wxIdleEvent &event);
50 FucdLayer* GetLayer() { return smf; };
51 diff -uNr atmelwlandriver.orig/src/apps/fw-upgrade/Makefile atmelwlandriver/src/apps/fw-upgrade/Makefile
52 --- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile 2005-07-22 09:37:22.000000000 +0200
53 +++ atmelwlandriver/src/apps/fw-upgrade/Makefile 2006-04-11 20:41:06.000000000 +0200
55 #########################################
58 -CC:=$(shell wx-config --cxx)
59 +CC:=$(shell $(WXCONFIG) --cxx)
61 -CFLAGS:=$(shell wx-config --cxxflags)
62 -CFLAGS1:=$(shell wx-config --libs)
63 +CFLAGS:=$(shell $(WXCONFIG) --cxxflags)
64 +CFLAGS1:=$(shell $(WXCONFIG) --libs)
65 CCFLAGS:= -O2 -Wall -Wstrict-prototypes
66 OUTDIR:="/usr/local/bin"
71 for path_dir in `echo $(PATH) | tr : ' '`; do\
72 - if test -f $$path_dir/wx-config; then\
73 + if test -f $$path_dir/$(WXCONFIG); then\
77 if test $$config_exists = 'no'; then\
78 echo 'It seems that the wxWindows library is not installed.';\
79 - echo 'wx-config, the script providing information about wxWindows';\
80 + echo '$(WXCONFIG), the script providing information about wxWindows';\
81 echo 'installation, is missing. Please, refer to the README.linux';\
82 echo 'or visit www.wxwindows.org for further information.';\
83 echo 'We are sorry about the inconvenience.';\