summaryrefslogtreecommitdiff
path: root/network/aMule/aMule-wx2.80.patch
blob: ce38ead42e3017d859ad96a4106436f661020e3c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
diff -urN aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
--- aMule-2.1.3/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 )
 EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel )       	// Defined in wxDialog
 EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
 EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
 END_EVENT_TABLE ()
--- aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.h	2006-12-17 22:17:39.017417250 +0100
+++ aMule-2.1.3/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-2.1.3/src/MuleGifCtrl.cpp	2006-02-03 20:14:05.000000000 +0100
+++ aMule-2.1.3/src/MuleGifCtrl.cpp	2006-11-19 19:35:33.000000000 +0100
@@ -24,7 +24,6 @@
 
 #include <wx/mstream.h>
 #include <wx/gifdecod.h>
-#include <wx/window.h>
 #include <wx/dcbuffer.h>
 
 #include "MuleGifCtrl.h"
@@ -35,6 +34,50 @@
 	EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
 END_EVENT_TABLE()
 
+#if wxCHECK_VERSION(2, 7, 1)
+// Wrapper that emulates old wxGIFDecoder API
+
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+	MuleGIFDecoder(wxInputStream* stream, bool dummy) {
+		m_stream = stream;
+		dummy = dummy; // Unused.
+		m_nframe = 0;
+	}
+	
+	~MuleGIFDecoder() { /* don't delete the stream! */ }
+	
+	wxGIFErrorCode ReadGIF() {
+		return LoadGIF(*m_stream);
+	}
+	
+	void GoFirstFrame() { m_nframe = 0; }
+	void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
+	void GoLastFrame() { m_nframe = GetFrameCount(); }
+	
+	void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
+	
+	size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
+	size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
+	
+	size_t	GetLeft() { return 0; }
+	size_t	GetTop() { return 0; }
+	
+	long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
+	
+private:
+	uint32_t m_nframe;
+	wxInputStream* m_stream;
+};
+
+#else
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+	MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
+};
+#endif
+
+
 
 MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
                           const wxSize& size, long style, const wxValidator& validator,
@@ -66,7 +109,7 @@
 	}
 
   	wxMemoryInputStream stream(data, size);
-  	m_decoder = new wxGIFDecoder(&stream, TRUE);
+  	m_decoder = new MuleGIFDecoder(&stream, TRUE);
   	if ( m_decoder->ReadGIF() != wxGIF_OK ) {
    		delete m_decoder;
    		m_decoder = NULL;
@@ -137,3 +180,4 @@
 	dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
 }
 
+// File_checked_for_headers
--- aMule-2.1.3/src/MuleGifCtrl.h	2006-01-01 06:17:25.000000000 +0100
+++ aMule-2.1.3/src/MuleGifCtrl.h	2006-11-18 05:01:22.000000000 +0100
@@ -27,11 +27,10 @@
 
 #include <wx/control.h>
 #include <wx/timer.h>
-#include <wx/bitmap.h>
 
 const int GIFTIMERID = 271283;
 
-class wxGIFDecoder;
+class MuleGIFDecoder;
 class wxBitmap;
 
 /**
@@ -121,7 +120,7 @@
 	void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
 
 	//! A pointer to the current gif-animation.
-	wxGIFDecoder*	m_decoder;
+	MuleGIFDecoder*	m_decoder;
 	//! Timer used for the delay between each frame.
 	wxTimer			m_timer;
 	//! Current frame.
@@ -133,3 +132,4 @@
 
 #endif
 
+// File_checked_for_headers
--- aMule-2.1.3/src/MuleTextCtrl.cpp~	2006-12-17 20:55:37.157820250 +0100
+++ aMule-2.1.3/src/MuleTextCtrl.cpp	2006-12-17 20:56:21.328580750 +0100
@@ -26,6 +26,7 @@
 #include <wx/menu.h>
 #include <wx/intl.h>
 #include <wx/clipbrd.h>
+#include <wx/dataobj.h>
 
 /**
  * These are the IDs used to identify the different menu-items.
--- aMule-2.1.3/src/amule.cpp~	2006-12-17 21:53:26.474639000 +0100
+++ aMule-2.1.3/src/amule.cpp	2006-12-17 21:55:40.307003000 +0100
@@ -96,6 +96,7 @@
 		#include <CoreFoundation/CFBundle.h>
 		#include <wx/mac/corefoundation/cfstring.h>
 	#endif
+	#include <wx/msgdlg.h>
 #endif