Imported Upstream version 1.0.2797

4 files changed, 7 insertions, 5 deletions

diff --git a/LiteEditor/buidltab.h b/LiteEditor/buidltab.h
index ce929ef0..dab2336e 100644
--- a/LiteEditor/buidltab.h
+++ b/LiteEditor/buidltab.h
@@ -35,7 +35,7 @@
 
 class LEditor;
 
-class BuildTab : protected OutputTabWindow
+class BuildTab : public OutputTabWindow
 {
     friend class ErrorsTab;
 
@@ -106,7 +106,7 @@ protected:
 public:
 	BuildTab(wxWindow *parent, wxWindowID id, const wxString &name);
 	~BuildTab();
-    
+
     wxString GetBuildToolTip(const wxString &fileName, int lineno);
 };
 #endif // __buidltab__
diff --git a/LiteEditor/findreplacedlg.cpp b/LiteEditor/findreplacedlg.cpp
index 8c5a516e..c1ad8103 100644
--- a/LiteEditor/findreplacedlg.cpp
+++ b/LiteEditor/findreplacedlg.cpp
@@ -46,7 +46,7 @@ BEGIN_EVENT_TABLE(FindReplaceDialog, wxDialog)
 END_EVENT_TABLE()

 

 #define VALIDATE_FINDWHAT(){\

-	if(m_findString->GetValue().Trim().IsEmpty()){\

+	if(m_findString->GetValue().IsEmpty()){\

 			wxMessageBox(_("'Find What' is empty"));\

 			return;\

 		}\

diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index 66380fb7..57135d6b 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -961,7 +961,7 @@ wxString Manager::GetProjectExecutionCommand ( const wxString& projectName, wxSt
 		if ( bldConf->GetPauseWhenExecEnds() ) {

 			wxString ld_lib_path;

 			wxFileName exePath ( wxStandardPaths::Get().GetExecutablePath() );

-			wxFileName exeWrapper ( exePath.GetPath(), wxT ( "le_exec.sh" ) );

+			wxFileName exeWrapper ( exePath.GetPath(), wxT ( "codelite_exec" ) );

 

 			if ( wxGetEnv ( wxT ( "LD_LIBRARY_PATH" ), &ld_lib_path ) && ld_lib_path.IsEmpty() == false ) {

 				command << wxT ( "/bin/sh -f " ) << exeWrapper.GetFullPath() << wxT ( " LD_LIBRARY_PATH=" ) << ld_lib_path << wxT ( " " );

@@ -1394,6 +1394,7 @@ void Manager::DoGetAccelFiles ( wxArrayString& files )
 

 void Manager::DumpMenu ( wxMenu *menu, const wxString &label, wxString &content )

 {

+#if 0

 	wxMenuItemList items = menu->GetMenuItems();

 	wxMenuItemList::iterator iter = items.begin();

 	for ( ; iter != items.end(); iter++ ) {

@@ -1418,6 +1419,7 @@ void Manager::DumpMenu ( wxMenu *menu, const wxString &label, wxString &content
 		}

 		content << wxT ( "\n" );

 	}

+#endif

 }

 

 

diff --git a/LiteEditor/svninfo.cpp b/LiteEditor/svninfo.cpp
index 6fb9b347..8da71d08 100644
--- a/LiteEditor/svninfo.cpp
+++ b/LiteEditor/svninfo.cpp
@@ -1,3 +1,3 @@
 #include <wx/string.h>
-const wxChar * SvnRevision = wxT("2785");
+const wxChar * SvnRevision = wxT("2797");