--- jaffm-1.2.1/mainwindow.cpp.orig	2005-07-27 23:23:56.000000000 -0500
+++ jaffm-1.2.1/mainwindow.cpp	2005-07-27 23:15:53.000000000 -0500
@@ -541,7 +541,7 @@
 	// the keycodes are hardcoded into USettings,
 	// so that we'll only have to change USettings
 	// and not MainWindow as well, when the time comes.
-	std::string sKeySignal = oSettings->getKeySignal(oEvent.GetCode());
+	std::string sKeySignal = oSettings->getKeySignal(oEvent.GetKeyCode());
 	
 	if (sKeySignal == "ToggleMenubar")
 	{
--- jaffm-1.2.1/settingswindow.cpp.orig	2005-04-06 11:18:58.000000000 -0500
+++ jaffm-1.2.1/settingswindow.cpp	2005-07-27 23:25:47.000000000 -0500
@@ -45,9 +45,9 @@
 	oButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	
 	// Control creation.
-	btnFiles = new wxButton(oPanel, BTN_FILES, "Files");
-	btnExec = new wxButton(oPanel, BTN_EXEC, "Executables");
-	btnFolders = new wxButton(oPanel, BTN_FOLDERS, "Folders");
+	btnFiles = new wxButton(oPanel, BTN_FILES, wxT("Files"));
+	btnExec = new wxButton(oPanel, BTN_EXEC, wxT("Executables"));
+	btnFolders = new wxButton(oPanel, BTN_FOLDERS, wxT("Folders"));
 	
 	oFileSettingsPanel = new FileSettingsPanel(oPanel, oSettings);
 	oExecSettingsPanel = new ExecSettingsPanel(oPanel, oSettings);
--- jaffm-1.2.1/filetree.cpp.orig	2005-06-10 13:57:19.000000000 -0500
+++ jaffm-1.2.1/filetree.cpp	2005-07-28 00:03:29.000000000 -0500
@@ -51,7 +51,7 @@
 	sDir = GetItemText(iItem);
 	while (iNewID != GetRootItem())
 	{
-		iNewID = GetParent(iNewID);
+		iNewID = GetItemParent(iNewID);
 		sDir = GetItemText(iNewID) + _("/") + sDir;
 	}
 	sDir.Replace(_("//"), _("/"));
@@ -96,7 +96,7 @@
 			wxTreeItemId iParent;
 			wxTreeItemId iNext;
 			wxTreeItemId iPrev;
-			iParent = GetParent(iItemID);
+			iParent = GetItemParent(iItemID);
 			wxString sParentDir;
 			sParentDir = getFullpath(iParent);
 			iNext = GetNextSibling(iItemID);
@@ -279,7 +279,7 @@
 	{
 		if (getTreeSelection() == iDeletedItems[i])
 		{
-			wxTreeItemId iParent = GetParent(iDeletedItems[i]);
+			wxTreeItemId iParent = GetItemParent(iDeletedItems[i]);
 			wxString sParentDir(getFullpath(iParent));
 			wxTreeItemId iNext = GetNextSibling(iDeletedItems[i]);
 			wxTreeItemId iPrev = GetPrevSibling(iDeletedItems[i]);
@@ -429,7 +429,7 @@
 	}
 	else
 	{
-		iParentID = GetParent(iItemID);
+		iParentID = GetItemParent(iItemID);
 		sParentDir = getFullpath(iParentID);
 	}
 	if (!wxFile::Exists(sParentDir + _("/") + sFilename))
@@ -473,7 +473,7 @@
 	}
 	else
 	{
-		iParentID = GetParent(iItemID);
+		iParentID = GetItemParent(iItemID);
 		sParentDir = getFullpath(iParentID);
 	}
 	if (!wxDir::Exists(sParentDir + _("/") + sFoldername))
@@ -570,9 +570,9 @@
 	{
 		CollapseAndReset(getTreeSelection());
 	}
-	else if (GetParent(getTreeSelection()))
+	else if (GetItemParent(getTreeSelection()))
 	{
-		selectTreeItem(GetParent(getTreeSelection()));
+		selectTreeItem(GetItemParent(getTreeSelection()));
 	}
 }
 
--- jaffm-1.2.1/execsettingspanel.cpp.orig	2005-03-27 09:04:00.000000000 -0600
+++ jaffm-1.2.1/execsettingspanel.cpp	2005-07-28 00:04:49.000000000 -0500
@@ -24,9 +24,9 @@
 	oButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 
 	// Control creation.
-	btnAdd = new wxButton(this, BTN_ADD, "Add");
-	btnChange = new wxButton(this, BTN_CHANGE, "Change");
-	btnDelete = new wxButton(this, BTN_DELETE, "Delete");
+	btnAdd = new wxButton(this, BTN_ADD, wxT("Add"));
+	btnChange = new wxButton(this, BTN_CHANGE, wxT("Change"));
+	btnDelete = new wxButton(this, BTN_DELETE, wxT("Delete"));
 
 	// Sizer manipulation.
 	oButtonSizer->Add(btnDelete);