[patch] Partial patch to build with newer toolchain (gcc 4.3.3).

toolchain-update.patch (text/plain), 3.76 KB, created by Steve Arnold on 2009-05-19 00:22:37 UTC

--- src/Config.cpp.orig	2009-05-17 12:17:22.956483162 -0700
+++ src/Config.cpp	2009-05-17 14:19:38.187487152 -0700
@@ -9,7 +9,7 @@
 	wxString strDir;
 	for (int nDir = 0; nDir < c_nMaxDirs; nDir++)
 	{
-		strDir.Printf("dir%d", nDir);
+		strDir.Printf(wxT("dir%d"), nDir);
 		cfg->Read(strDir, &m_strDir[nDir]);
 	}
 }
@@ -20,7 +20,7 @@
 	wxString strDir;
 	for (int nDir = 0; nDir < c_nMaxDirs; nDir++)
 	{
-		strDir.Printf("dir%d", nDir);
+		strDir.Printf(wxT("dir%d"), nDir);
 		cfg->Write(strDir, m_strDir[nDir]);
 	}
 }
--- src/EzGrid.cpp.orig	2009-05-17 12:17:22.000000000 -0700
+++ src/EzGrid.cpp	2009-05-17 14:27:54.791235655 -0700
@@ -14,7 +14,7 @@
 	// Adjust the default row height to be more compact
 	wxFont font = GetLabelFont();
 	int w=40, h=18; 
-	GetTextExtent("a", &w, &h, NULL, NULL, &font);
+	GetTextExtent(wxT("a"), &w, &h, NULL, NULL, &font);
 	SetColLabelSize(h+6);
 #ifdef __WXGTK__
 	SetDefaultRowSize(h+8, TRUE);	
@@ -30,7 +30,7 @@
 	wxString strCol;
 	for (int nCol = 0; nCol < GetNumberCols(); nCol++)
 	{
-		strCol.Printf("column%d", nCol);
+		strCol.Printf(wxT("column%d"), nCol);
 		cfg->Write(strCol, (long)GetColSize(nCol));
 	}
 }
@@ -61,7 +61,7 @@
 	long nColWidth;
 	for (int nCol = 0; nCol < GetNumberCols(); nCol++)
 	{
-		strCol.Printf("column%d", nCol);
+		strCol.Printf(wxT("column%d"), nCol);
 		if (cfg->Read(strCol, &nColWidth))
 			SetColSize(nCol, nColWidth);
 	}
--- src/EzGrid.h.orig	2009-05-17 14:28:26.623235929 -0700
+++ src/EzGrid.h	2009-05-17 14:28:57.045484999 -0700
@@ -7,7 +7,7 @@
 class EzGrid : public wxGrid
 {
 public:
-	EzGrid::EzGrid(wxWindow *parent,
+	EzGrid(wxWindow *parent,
 		wxWindowID id,	const wxPoint& pos = wxDefaultPosition,
 		const wxSize& size = wxDefaultSize, long style = wxWANTS_CHARS,
 		const wxString& name = wxPanelNameStr);
--- src/EzTag.h.orig	2009-05-17 15:36:38.749485258 -0700
+++ src/EzTag.h	2009-05-17 23:31:14.196065453 -0700
@@ -1,6 +1,8 @@
 #ifndef _EZTAG_H_INCLUDED_
 #define _EZTAG_H_INCLUDED_
 
+#include <wx/string.h>
+#include <wx/strconv.h>
 #include <id3/tag.h>
 
 const int nMaxFrameTypes = 4;
@@ -8,18 +10,20 @@
 
 // provides easier to use functions for ID3_Tag
 class EzTag : public ID3_Tag
+
 {
 public:
 	EzTag();
 	~EzTag();
 	wxString GetField(ID3_FrameID fid);
-	void UpdateTag(int nFrameIDIndex, const wxChar *text);
+	void UpdateTag(int nFrameIDIndex, const wxString& text);
 	void SetFileToLink(const wxString& strFileToLink)
 	{
 		m_strFileToLink = strFileToLink;
 	}
 private:
 	wxString m_strFileToLink;
+	const char *strFileToLink;
 };
 
 
--- src/EzTag.cpp.orig	2009-05-17 14:29:53.958235696 -0700
+++ src/EzTag.cpp	2009-05-17 23:31:17.219486012 -0700
@@ -12,16 +12,16 @@
 {
 }
 
-void EzTag::UpdateTag(int nFrameIDIndex, const wxChar *text)
+void EzTag::UpdateTag(int nFrameIDIndex, const wxString& text)
 {
 	wxASSERT(nFrameIDIndex > 0 && nFrameIDIndex < nMaxFrameTypes);
 	if (!m_strFileToLink.IsEmpty())
 	{
-		Link(m_strFileToLink);
+		Link(strFileToLink, ID3TT_ALL);
 		m_strFileToLink.IsEmpty();
 	}
 	ID3_Frame* frame = NULL;
-	if (NULL != text)
+	if (! wxIsEmpty(text))
 	{
 		// first remove old tag
 		frame = Find(c_frameID[nFrameIDIndex]);
@@ -30,10 +30,12 @@
 			frame = RemoveFrame(frame);
 			delete frame;
 		}
-		if (strlen(text) > 0)
+		if (!wxIsEmpty(text))
 		{
+			ID3_Field* field = NULL;
 			frame = new ID3_Frame(c_frameID[nFrameIDIndex]);
-			frame->GetField(ID3FN_TEXT)->Set(text);
+			field = frame->GetField(ID3FN_TEXT);
+			field->Set((const char*) wxConvCurrent->cWX2MB(text));
 			AttachFrame(frame);
 		}
 	}
@@ -61,7 +63,7 @@
 		return str;
 	} // no field found
 	field->SetEncoding(ID3TE_ISO8859_1); // use Latin-1 charset
-	str = field->GetRawText(); // TODO: GetRawUnicodeText
+	str = field->GetRawUnicodeText(); // TODO: GetRawUnicodeText
 	str.Trim(true);
 	str.Trim(false);
 	return str;