[packages/atmelwlandriver.git] / atmelwlandriver-fwupgrade.patch

--- atmelwlandriver.orig/src/apps/fw-upgrade/FucdApp.cpp	2005-07-22 09:37:22.000000000 +0200
+++ atmelwlandriver/src/apps/fw-upgrade/FucdApp.cpp	2006-04-11 21:29:38.000000000 +0200
@@ -92,7 +92,7 @@
 END_EVENT_TABLE()
 
 
-void FucdFrame::OnRescan()
+void FucdFrame::OnRescan(wxCommandEvent &event)
 {
 	wxChoice *devchoice = (wxChoice*)FindWindowById(ID_CH_DEVICES);
 	smf->FindDevices();
@@ -109,7 +109,7 @@
 }
 
 
-void FucdFrame::OnUpgradeFW()
+void FucdFrame::OnUpgradeFW(wxCommandEvent &event)
 {
 	wxString fw_ver;
 	gg_dload->SetValue(0);	// Initialize GG
@@ -171,7 +171,7 @@
        return;
 }
 
-void FucdFrame::OnBtFile()
+void FucdFrame::OnBtFile(wxCommandEvent &event)
 {
         wxString filename, fullpath;
 	wxFileDialog fwfd(this, _("Choose a firmware image"), wxT("../"), wxT(""), 
--- atmelwlandriver.orig/src/apps/fw-upgrade/FucdApp.h	2005-07-22 09:37:22.000000000 +0200
+++ atmelwlandriver/src/apps/fw-upgrade/FucdApp.h	2006-04-11 21:28:30.000000000 +0200
@@ -57,13 +57,13 @@
 
     public:
         FucdFrame(wxWindow* parent, wxWindowID id, const wxString &title);
-        void OnUpgradeFW();
-	void OnBtFile();
+        void OnUpgradeFW(wxCommandEvent &event);
+	void OnBtFile(wxCommandEvent &event);
 	void OnTimer(wxTimerEvent &event);
 	void OnClose(wxCloseEvent &event);
 	void OnBtClose(wxCommandEvent &event);
 	void OnSelectDevice(wxCommandEvent &event);
-	void OnRescan();
+	void OnRescan(wxCommandEvent &event);
 	void OnIdle(wxIdleEvent &event);
 	
 	FucdLayer* GetLayer() { return smf; };
--- atmelwlandriver/src/apps/fw-upgrade/Makefile	2006-04-11 20:41:06.000000000 +0200
+++ atmelwlandriver/src/apps/fw-upgrade/Makefile	2011-08-23 07:44:41.675357692 +0300
@@ -3,10 +3,10 @@
 #########################################
 
 
-CC:=$(shell wx-config --cxx)
+CC:=$(shell $(WXCONFIG) --cxx)
 CCC:=gcc
-CFLAGS:=$(shell wx-config --cxxflags) 
-CFLAGS1:=$(shell wx-config --libs)
+CFLAGS:=$(shell $(WXCONFIG) --cxxflags) 
+CFLAGS1:=$(shell $(WXCONFIG) --libs)
 CCFLAGS:= -O2 -Wall -Wstrict-prototypes
 OUTDIR:="/usr/local/bin"
 
@@ -34,13 +34,13 @@
 wxconfig:
 	@config_exists=no;\
 	for path_dir in `echo $(PATH) | tr : ' '`; do\
-	  if test -f $$path_dir/wx-config; then\
+	  if test -f $$path_dir/$(WXCONFIG); then\
 	    config_exists=yes;\
-	  fi\
+	  fi;\
 	done;\
 	if test $$config_exists = 'no'; then\
 	  echo 'It seems that the wxWindows library is not installed.';\
-	  echo 'wx-config, the script providing information about wxWindows';\
+	  echo '$(WXCONFIG), the script providing information about wxWindows';\
 	  echo 'installation, is missing. Please, refer to the README.linux';\
 	  echo 'or visit www.wxwindows.org for further information.';\
 	  echo 'We are sorry about the inconvenience.';\
Commit	Line	Data
9e4b61ba MŁ	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
	3	@@ -92,7 +92,7 @@
	4	END_EVENT_TABLE()
	5
	6
	7	-void FucdFrame::OnRescan()
	8	+void FucdFrame::OnRescan(wxCommandEvent &event)
	9	{
	10	wxChoice devchoice = (wxChoice)FindWindowById(ID_CH_DEVICES);
	11	smf->FindDevices();
	12	@@ -109,7 +109,7 @@
	13	}
	14
	15
	16	-void FucdFrame::OnUpgradeFW()
	17	+void FucdFrame::OnUpgradeFW(wxCommandEvent &event)
	18	{
	19	wxString fw_ver;
	20	gg_dload->SetValue(0); // Initialize GG
	21	@@ -171,7 +171,7 @@
	22	return;
	23	}
	24
	25	-void FucdFrame::OnBtFile()
	26	+void FucdFrame::OnBtFile(wxCommandEvent &event)
	27	{
	28	wxString filename, fullpath;
	29	wxFileDialog fwfd(this, _("Choose a firmware image"), wxT("../"), wxT(""),
9e4b61ba MŁ	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
	32	@@ -57,13 +57,13 @@
	33
	34	public:
	35	FucdFrame(wxWindow* parent, wxWindowID id, const wxString &title);
	36	- void OnUpgradeFW();
	37	- void OnBtFile();
	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);
	44	- void OnRescan();
	45	+ void OnRescan(wxCommandEvent &event);
	46	void OnIdle(wxIdleEvent &event);
	47
	48	FucdLayer* GetLayer() { return smf; };
2b8543c5 ER	49	--- atmelwlandriver/src/apps/fw-upgrade/Makefile 2006-04-11 20:41:06.000000000 +0200
2b8543c5 ER	50	+++ atmelwlandriver/src/apps/fw-upgrade/Makefile 2011-08-23 07:44:41.675357692 +0300
9e4b61ba MŁ	51	@@ -3,10 +3,10 @@
	52	#########################################
	53
	54
	55	-CC:=$(shell wx-config --cxx)
	56	+CC:=$(shell $(WXCONFIG) --cxx)
	57	CCC:=gcc
	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"
	64
	65	@@ -34,13 +34,13 @@
	66	wxconfig:
	67	@config_exists=no;\
	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\
	71	config_exists=yes;\
2b8543c5 ER	72	- fi\
2b8543c5 ER	73	+ fi;\
9e4b61ba MŁ	74	done;\
	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.';\