etexteditor-linux-patch.diff

diff --git a/src/DiffDirPane.cpp b/src/DiffDirPane.cpp
index 5060137..9b39681 100644
--- a/src/DiffDirPane.cpp
+++ b/src/DiffDirPane.cpp
@@ -32,18 +32,18 @@ enum {
 WX_DECLARE_STRING_HASH_MAP( wxTreeItemId, NameToTreeIdHash );
 
 BEGIN_EVENT_TABLE(DiffDirPane, wxPanel)
-	EVT_TREE_ITEM_GETTOOLTIP(ID_DIFFTREE, OnTreeGetToolTip)
-	EVT_TREE_ITEM_MENU(ID_DIFFTREE, OnTreeMenu)
-	EVT_TREE_ITEM_ACTIVATED(ID_DIFFTREE, OnTreeActivated)
-	EVT_TREE_ITEM_EXPANDING(ID_DIFFTREE, OnTreeExpanding)
-	EVT_MENU(ID_MENU_COMPARE, OnMenuCompare)
-	EVT_MENU(ID_MENU_OPEN, OnMenuOpen)
-	EVT_MENU(ID_MENU_OPENLEFT, OnMenuOpenLeft)
-	EVT_MENU(ID_MENU_OPENRIGHT, OnMenuOpenRight)
-	EVT_MENU(ID_MENU_COPYLEFT, OnMenuCopyToLeft)
-	EVT_MENU(ID_MENU_COPYRIGHT, OnMenuCopyToRight)
-	EVT_MENU(ID_MENU_DELLEFT, OnMenuDelLeft)
-	EVT_MENU(ID_MENU_DELRIGHT, OnMenuDelRight)
+	EVT_TREE_ITEM_GETTOOLTIP(ID_DIFFTREE, DiffDirPane::OnTreeGetToolTip)
+	EVT_TREE_ITEM_MENU(ID_DIFFTREE, DiffDirPane::OnTreeMenu)
+	EVT_TREE_ITEM_ACTIVATED(ID_DIFFTREE, DiffDirPane::OnTreeActivated)
+	EVT_TREE_ITEM_EXPANDING(ID_DIFFTREE, DiffDirPane::OnTreeExpanding)
+	EVT_MENU(ID_MENU_COMPARE, DiffDirPane::OnMenuCompare)
+	EVT_MENU(ID_MENU_OPEN, DiffDirPane::OnMenuOpen)
+	EVT_MENU(ID_MENU_OPENLEFT, DiffDirPane::OnMenuOpenLeft)
+	EVT_MENU(ID_MENU_OPENRIGHT, DiffDirPane::OnMenuOpenRight)
+	EVT_MENU(ID_MENU_COPYLEFT, DiffDirPane::OnMenuCopyToLeft)
+	EVT_MENU(ID_MENU_COPYRIGHT, DiffDirPane::OnMenuCopyToRight)
+	EVT_MENU(ID_MENU_DELLEFT, DiffDirPane::OnMenuDelLeft)
+	EVT_MENU(ID_MENU_DELRIGHT, DiffDirPane::OnMenuDelRight)
 END_EVENT_TABLE()
 
 DiffDirPane::DiffDirPane(EditorFrame& parent)
diff --git a/src/DiffDirPane.h b/src/DiffDirPane.h
index 4854572..cf75385 100644
--- a/src/DiffDirPane.h
+++ b/src/DiffDirPane.h
@@ -19,6 +19,7 @@
 	#include <wx/wx.h>
 #endif
 #include <wx/treectrl.h>
+#include <wx/imaglist.h>
 
 WX_DECLARE_STRING_HASH_MAP( int, IconHash );
 
diff --git a/src/EditorCtrl.cpp b/src/EditorCtrl.cpp
index 20d6a4d..49da1d1 100644
--- a/src/EditorCtrl.cpp
+++ b/src/EditorCtrl.cpp
@@ -2544,7 +2544,7 @@ bool EditorCtrl::SaveText(bool askforpath) {
 
 	if (askforpath || newpath.empty()) {
 		wxFileDialog dlg(this, _T("Save as..."), _T(""), _T(""), EditorFrame::DefaultFileFilters, wxSAVE|wxCHANGE_DIR);
-		dlg.SetPath( newpath.empty() ? _("Untitled") : newpath );
+		dlg.SetPath( newpath.empty() ? wxT("Untitled") : newpath );
 
 		dlg.Centre();
 		if (dlg.ShowModal() != wxID_OK) return false;
diff --git a/src/EditorFrame.cpp b/src/EditorFrame.cpp
index 4d71a53..db2be4d 100644
--- a/src/EditorFrame.cpp
+++ b/src/EditorFrame.cpp
@@ -74,7 +74,7 @@
 #include "Winuser.h"
 #include <wx/msw/registry.h>
 #endif
-
+#include <stdint.h>
 
 class FrameDropTarget : public wxFileDropTarget {
 public:
diff --git a/src/Env.cpp b/src/Env.cpp
index 3f052fd..46f6a3f 100644
--- a/src/Env.cpp
+++ b/src/Env.cpp
@@ -4,7 +4,7 @@
 
 #include <wx/filename.h>
 #include <wx/file.h>
-
+#include <wx/utils.h>
 void cxEnv::SetEnv(const wxString& key, const wxString& value) {
 	wxASSERT(!key.empty());
 	m_env[key] = value;
diff --git a/src/IHtmlWnd.h b/src/IHtmlWnd.h
index 5366a35..01bb4bd 100644
--- a/src/IHtmlWnd.h
+++ b/src/IHtmlWnd.h
@@ -19,7 +19,7 @@ class IHtmlWnd {
 public:
 	virtual ~IHtmlWnd() {};
 	virtual wxWindow* GetWindow() = 0;
-	virtual bool LoadString(const wxString& html) = 0;
+	virtual bool LoadString(const wxString html) = 0;
 	virtual void LoadUrl(const wxString &_url, const wxString &_frame = wxEmptyString, bool keepHistory=false) = 0;
 	virtual bool Refresh(wxHtmlRefreshLevel level) = 0;
 	virtual bool GoBack() = 0;
diff --git a/src/RemoteProfileDlg.cpp b/src/RemoteProfileDlg.cpp
index e6a2a46..69c27fc 100644
--- a/src/RemoteProfileDlg.cpp
+++ b/src/RemoteProfileDlg.cpp
@@ -15,7 +15,7 @@
 #include <wx/notebook.h>
 #include "RemoteThread.h"
 #include "eSettings.h"
-
+#include <stdint.h>
 // Ctrl id's
 enum {
 	CTRL_PROFILELIST = 100,
diff --git a/src/SearchPanel.cpp b/src/SearchPanel.cpp
index deaec93..5f2a017 100644
--- a/src/SearchPanel.cpp
+++ b/src/SearchPanel.cpp
@@ -245,7 +245,7 @@ void SearchPanel::SetState(cxFindResult result, int resultCount) {
 	}
 	searchbox->Refresh();
 
-	wxString results = (0 <= resultCount) ? wxString::Format(wxT("%d results"), resultCount) : wxEmptyString;
+	wxString results = (0 <= resultCount) ? wxString::Format(wxT("%d results"), resultCount) : wxString();
 	commandResults->SetLabel(results);
 }
 
diff --git a/src/Strings.cpp b/src/Strings.cpp
index 32b2b53..1da573c 100644
--- a/src/Strings.cpp
+++ b/src/Strings.cpp
@@ -1,6 +1,7 @@
 #include "Strings.h"
 #include <wx/tokenzr.h>
 #include "Utf.h"
+#include <stdint.h>
 
 #ifdef __WXMSW__
 void InplaceConvertCRLFtoLF(wxString& text) {
diff --git a/src/WebKitHtmlWnd.cpp b/src/WebKitHtmlWnd.cpp
index dfd6ea2..1fb949f 100644
--- a/src/WebKitHtmlWnd.cpp
+++ b/src/WebKitHtmlWnd.cpp
@@ -28,7 +28,7 @@ wxWindow* wxBrowser::GetWindow() {
     return static_cast<wxWindow*>(this);
 }
 
-bool wxBrowser::LoadString(const wxString& html) {
+bool wxBrowser::LoadString(const wxString html) {
 	wxWebView::SetPageSource(html);
 	m_realLocation = wxT("file://");
 	return true;
diff --git a/src/cx_pcre_chartables.cpp b/src/cx_pcre_chartables.cpp
index ae45db0..00ea704 100644
--- a/src/cx_pcre_chartables.cpp
+++ b/src/cx_pcre_chartables.cpp
@@ -24,7 +24,7 @@ unit might reference this" and so it will always be supplied to the linker. */
 #include "config.h"
 #endif
 
-#include "pcre_internal.h"
+#include "../external/pcre/pcre_internal.h"
 
 const unsigned char _pcre_default_tables[] = {
 
diff --git a/src/eBrowser.h b/src/eBrowser.h
index 02ad7c6..762f0f4 100644
--- a/src/eBrowser.h
+++ b/src/eBrowser.h
@@ -25,7 +25,7 @@ inline wxBrowser* NewBrowser(wxWindow * parent, wxWindowID id,
 				const wxPoint& point = wxDefaultPosition, 
                 const wxSize& size = wxDefaultSize) 
 {
-	return new wxBrowser(parent, id, point, size);
+	return new wxBrowser(parent, id);
 }
 #endif