projects / packages / atmelwlandriver.git / blame
| Commit | Line | Data |
|---|---|---|
| 9e4b61ba MŁ |
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 | |
| 4 | @@ -92,7 +92,7 @@ | |
| 5 | END_EVENT_TABLE() | |
| 6 | ||
| 7 | ||
| 8 | -void FucdFrame::OnRescan() | |
| 9 | +void FucdFrame::OnRescan(wxCommandEvent &event) | |
| 10 | { | |
| 11 | wxChoice *devchoice = (wxChoice*)FindWindowById(ID_CH_DEVICES); | |
| 12 | smf->FindDevices(); | |
| 13 | @@ -109,7 +109,7 @@ | |
| 14 | } | |
| 15 | ||
| 16 | ||
| 17 | -void FucdFrame::OnUpgradeFW() | |
| 18 | +void FucdFrame::OnUpgradeFW(wxCommandEvent &event) | |
| 19 | { | |
| 20 | wxString fw_ver; | |
| 21 | gg_dload->SetValue(0); // Initialize GG | |
| 22 | @@ -171,7 +171,7 @@ | |
| 23 | return; | |
| 24 | } | |
| 25 | ||
| 26 | -void FucdFrame::OnBtFile() | |
| 27 | +void FucdFrame::OnBtFile(wxCommandEvent &event) | |
| 28 | { | |
| 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 | |
| 34 | @@ -57,13 +57,13 @@ | |
| 35 | ||
| 36 | public: | |
| 37 | FucdFrame(wxWindow* parent, wxWindowID id, const wxString &title); | |
| 38 | - void OnUpgradeFW(); | |
| 39 | - void OnBtFile(); | |
| 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); | |
| 46 | - void OnRescan(); | |
| 47 | + void OnRescan(wxCommandEvent &event); | |
| 48 | void OnIdle(wxIdleEvent &event); | |
| 49 | ||
| 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 | |
| 54 | @@ -3,10 +3,10 @@ | |
| 55 | ######################################### | |
| 56 | ||
| 57 | ||
| 58 | -CC:=$(shell wx-config --cxx) | |
| 59 | +CC:=$(shell $(WXCONFIG) --cxx) | |
| 60 | CCC:=gcc | |
| 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" | |
| 67 | ||
| 68 | @@ -34,13 +34,13 @@ | |
| 69 | wxconfig: | |
| 70 | @config_exists=no;\ | |
| 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\ | |
| 74 | config_exists=yes;\ | |
| 75 | fi\ | |
| 76 | done;\ | |
| 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.';\ |