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