37
37
--- codelite.orig/Plugin/macros.h
38
38
+++ codelite/Plugin/macros.h
39
@@ -95,7 +95,7 @@ const wxString SEARCH_IN_CURR_FILE_PROJE
41
//////////////////////////////////////////////////////////////////////////////
42
//////////////////////////////////////////////////////////////////////////////
49
#include <wx/stdpaths.h>
50
-//-------------------------------------------------------
51
-// wxWidgets Connect macros
52
-//-------------------------------------------------------
54
-#define ConnectChoice(ctrl, fn)\
55
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(fn), NULL, this);
57
-#define ConnectButton(ctrl, fn)\
58
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(fn), NULL, this);
60
-#define ConnectListBoxDClick(ctrl, fn)\
61
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler(fn), NULL, this);
63
-#define ConnectCheckBox(ctrl, fn)\
64
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(fn), NULL, this);
66
-#define ConnectListCtrlItemSelected(ctrl, fn)\
67
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(fn), NULL, this);
69
-#define ConnectListCtrlItemActivated(ctrl, fn)\
70
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(fn), NULL, this);
72
-#define ConnectKeyDown(ctrl, fn)\
73
- ctrl->Connect(ctrl->GetId(), wxEVT_KEY_DOWN, wxKeyEventHandler(fn), NULL, this);
75
-#define ConnectCharEvent(ctrl, fn)\
76
- ctrl->Connect(ctrl->GetId(), wxEVT_CHAR, wxKeyEventHandler(fn), NULL, this);
78
-#define ConnectCmdTextEntered(ctrl, fn)\
79
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(fn), NULL, this);
81
-#define ConnectCmdTextUpdated(ctrl, fn)\
82
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(fn), NULL, this);
84
-#define ConnectCombo(ctrl, fn)\
85
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(fn), NULL, this);
87
-#define ConnectCheckList(ctrl, fn)\
88
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler(fn), NULL, this);
90
-#define TrimString(str){\
92
- str = str.Trim(false);\
95
-#define IsSourceFile(ext)\
96
- (ext == wxT("cpp") || ext == wxT("cxx") || ext == wxT("c") || ext == wxT("c++") || ext == wxT("cc"))
98
-#define BoolToString(b) b ? wxT("yes") : wxT("no")
100
-//-----------------------------------------------------
102
-//-----------------------------------------------------
104
-const wxString clCMD_NEW = wxT("<New...>");
105
-const wxString clCMD_EDIT = wxT("<Edit...>");
106
-const wxString clCMD_DELETE = wxT("<Delete...>");
109
-const wxString BUILD_START_MSG = wxT("----------Build Started--------\n");
110
-const wxString BUILD_END_MSG = wxT("----------Build Ended----------\n");
111
+//-------------------------------------------------------
112
+// wxWidgets Connect macros
113
+//-------------------------------------------------------
115
+#define ConnectChoice(ctrl, fn)\
116
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(fn), NULL, this);
118
+#define ConnectButton(ctrl, fn)\
119
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(fn), NULL, this);
121
+#define ConnectListBoxDClick(ctrl, fn)\
122
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler(fn), NULL, this);
124
+#define ConnectCheckBox(ctrl, fn)\
125
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(fn), NULL, this);
127
+#define ConnectListCtrlItemSelected(ctrl, fn)\
128
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(fn), NULL, this);
130
+#define ConnectListCtrlItemActivated(ctrl, fn)\
131
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(fn), NULL, this);
133
+#define ConnectKeyDown(ctrl, fn)\
134
+ ctrl->Connect(ctrl->GetId(), wxEVT_KEY_DOWN, wxKeyEventHandler(fn), NULL, this);
136
+#define ConnectCharEvent(ctrl, fn)\
137
+ ctrl->Connect(ctrl->GetId(), wxEVT_CHAR, wxKeyEventHandler(fn), NULL, this);
139
+#define ConnectCmdTextEntered(ctrl, fn)\
140
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(fn), NULL, this);
142
+#define ConnectCmdTextUpdated(ctrl, fn)\
143
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(fn), NULL, this);
145
+#define ConnectCombo(ctrl, fn)\
146
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(fn), NULL, this);
148
+#define ConnectCheckList(ctrl, fn)\
149
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler(fn), NULL, this);
151
+#define TrimString(str){\
153
+ str = str.Trim(false);\
156
+#define IsSourceFile(ext)\
157
+ (ext == wxT("cpp") || ext == wxT("cxx") || ext == wxT("c") || ext == wxT("c++") || ext == wxT("cc"))
159
+#define BoolToString(b) b ? wxT("yes") : wxT("no")
161
+//-----------------------------------------------------
163
+//-----------------------------------------------------
165
+const wxString clCMD_NEW = wxT("<New...>");
166
+const wxString clCMD_EDIT = wxT("<Edit...>");
167
+const wxString clCMD_DELETE = wxT("<Delete...>");
170
+const wxString BUILD_START_MSG = wxT("----------Build Started--------\n");
171
+const wxString BUILD_END_MSG = wxT("----------Build Ended----------\n");
172
const wxString BUILD_PROJECT_PREFIX = wxT("----------Building project:[ ");
173
const wxString CLEAN_PROJECT_PREFIX = wxT("----------Cleaning project:[ ");
174
-const wxString SEARCH_IN_WORKSPACE = wxT("Entire Workspace");
175
-const wxString SEARCH_IN_PROJECT = wxT("Active Project");
176
+const wxString SEARCH_IN_WORKSPACE = wxT("Entire Workspace");
177
+const wxString SEARCH_IN_PROJECT = wxT("Active Project");
178
const wxString SEARCH_IN_CURR_FILE_PROJECT = wxT("Current File's Project");
43
182
-#define TERMINAL_CMD wxString::Format(wxT("%s/codelite_xterm '$(TITLE)' '$(CMD)'"), wxFileName(wxStandardPaths::Get().GetExecutablePath()).GetPath().c_str())
44
+#define TERMINAL_CMD wxT("x-terminal-emulator -sb -title '$(TITLE)' -e '$(CMD)'")
183
+#define TERMINAL_CMD wxString::Format(wxT("%s/codelite_xterm '$(TITLE)' '$(CMD)'"), wxStandardPaths::Get().GetPluginsDir().c_str())
45
184
#elif defined(__WXMAC__)
46
185
#define TERMINAL_CMD wxString::Format(wxT("%s/OpenTerm '$(CMD)'"), wxStandardPaths::Get().GetDataDir().c_str())
187
const wxString TERMINAL_CMD = wxT("");
191
-#define PATH_SEP wxT("\\")
193
-#define PATH_SEP wxT("/")
196
-#define viewAsMenuItemID 23500
197
-#define viewAsMenuItemMaxID 23500+100
199
-#define viewAsSubMenuID 23499
200
-#define RecentFilesSubMenuID 23600
201
-#define RecentWorkspaceSubMenuID 23650
205
+#define PATH_SEP wxT("\\")
207
+#define PATH_SEP wxT("/")
210
+#define viewAsMenuItemID 23500
211
+#define viewAsMenuItemMaxID 23500+100
213
+#define viewAsSubMenuID 23499
214
+#define RecentFilesSubMenuID 23600
215
+#define RecentWorkspaceSubMenuID 23650
48
218
--- codelite.orig/Plugin/consolefinder.cpp
49
219
+++ codelite/Plugin/consolefinder.cpp
50
220
@@ -153,7 +153,9 @@ wxString ConsoleFinder::GetConsoleName()