1 diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
2 --- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp 2005-12-16 13:09:29.000000000 +0100
3 +++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp 2006-12-17 20:20:47.151203000 +0100
6 new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
8 - new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
9 + new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
11 m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
12 m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
14 EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
15 EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
16 EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
17 -EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel ) // Defined in wxDialog
18 EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
19 EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
21 --- aMule/src/utils/wxCas/src/wxcasprefs.h.org 2006-12-17 22:17:39.017417250 +0100
22 +++ aMule/src/utils/wxCas/src/wxcasprefs.h 2006-12-17 22:18:17.611829250 +0100
25 ID_AUTOSTATIMG_BROWSE_BUTTON,
33 --- aMule/src/MuleGifCtrl.cpp 2006-02-03 20:14:05.000000000 +0100
34 +++ aMule/src/MuleGifCtrl.cpp 2006-11-19 19:35:33.000000000 +0100
37 #include <wx/mstream.h>
38 #include <wx/gifdecod.h>
39 -#include <wx/window.h>
40 #include <wx/dcbuffer.h>
42 #include "MuleGifCtrl.h"
44 EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
47 +#if wxCHECK_VERSION(2, 7, 1)
48 +// Wrapper that emulates old wxGIFDecoder API
50 +class MuleGIFDecoder : public wxGIFDecoder {
52 + MuleGIFDecoder(wxInputStream* stream, bool dummy) {
54 + dummy = dummy; // Unused.
58 + ~MuleGIFDecoder() { /* don't delete the stream! */ }
60 + wxGIFErrorCode ReadGIF() {
61 + return LoadGIF(*m_stream);
64 + void GoFirstFrame() { m_nframe = 0; }
65 + void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
66 + void GoLastFrame() { m_nframe = GetFrameCount(); }
68 + void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
70 + size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
71 + size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
73 + size_t GetLeft() { return 0; }
74 + size_t GetTop() { return 0; }
76 + long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
80 + wxInputStream* m_stream;
84 +class MuleGIFDecoder : public wxGIFDecoder {
86 + MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
92 MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
93 const wxSize& size, long style, const wxValidator& validator,
97 wxMemoryInputStream stream(data, size);
98 - m_decoder = new wxGIFDecoder(&stream, TRUE);
99 + m_decoder = new MuleGIFDecoder(&stream, TRUE);
100 if ( m_decoder->ReadGIF() != wxGIF_OK ) {
104 dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
107 +// File_checked_for_headers
108 --- aMule/src/MuleGifCtrl.h 2006-01-01 06:17:25.000000000 +0100
109 +++ aMule/src/MuleGifCtrl.h 2006-11-18 05:01:22.000000000 +0100
112 #include <wx/control.h>
113 #include <wx/timer.h>
114 -#include <wx/bitmap.h>
116 const int GIFTIMERID = 271283;
119 +class MuleGIFDecoder;
124 void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
126 //! A pointer to the current gif-animation.
127 - wxGIFDecoder* m_decoder;
128 + MuleGIFDecoder* m_decoder;
129 //! Timer used for the delay between each frame.
136 +// File_checked_for_headers
137 --- aMule-2.1.3/src/MuleTextCtrl.cpp~ 2006-12-17 20:55:37.157820250 +0100
138 +++ aMule-2.1.3/src/MuleTextCtrl.cpp 2006-12-17 20:56:21.328580750 +0100
142 #include <wx/clipbrd.h>
143 +#include <wx/dataobj.h>
146 * These are the IDs used to identify the different menu-items.
147 --- amule/src/amule.cpp~ 2006-12-17 21:53:26.474639000 +0100
148 +++ amule/src/amule.cpp 2006-12-17 21:55:40.307003000 +0100
150 #include <CoreFoundation/CFBundle.h>
151 #include <wx/mac/corefoundation/cfstring.h>
153 + #include <wx/msgdlg.h>