From fa2bfda1f25d0b6d5c3c9a99e8a38a4eb34db0c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 17 Dec 2006 21:18:54 +0000 Subject: [PATCH] ID_CANCEL_BUTTON fixes Changed files: aMule-wx.patch -> 1.2 --- aMule-wx.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/aMule-wx.patch b/aMule-wx.patch index 8e0c48f..8148d35 100644 --- a/aMule-wx.patch +++ b/aMule-wx.patch @@ -1,6 +1,15 @@ diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp --- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp 2005-12-16 13:09:29.000000000 +0100 +++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp 2006-12-17 20:20:47.151203000 +0100 +@@ -297,7 +297,7 @@ + m_validateButton = + new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) ); + m_cancelButton = +- new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) ); ++ new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) ); + + m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 ); + m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 ); @@ -321,7 +321,6 @@ EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton ) EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton ) @@ -9,6 +18,18 @@ diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/uti EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck ) EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck ) END_EVENT_TABLE () +--- aMule/src/utils/wxCas/src/wxcasprefs.h.org 2006-12-17 22:17:39.017417250 +0100 ++++ aMule/src/utils/wxCas/src/wxcasprefs.h 2006-12-17 22:18:17.611829250 +0100 +@@ -101,8 +101,7 @@ + ID_AUTOSTATIMG_COMBO, + ID_AUTOSTATIMG_BROWSE_BUTTON, + ID_FTP_UPDATE_CHECK, +- ID_VALIDATE_BUTTON, +- ID_CANCEL_BUTTON ++ ID_VALIDATE_BUTTON + }; + + protected: --- aMule/src/MuleGifCtrl.cpp 2006-02-03 20:14:05.000000000 +0100 +++ aMule/src/MuleGifCtrl.cpp 2006-11-19 19:35:33.000000000 +0100 @@ -24,7 +24,6 @@ -- 2.43.0