Skip to content

Commit 7301062

Browse files
spillzspillz
authored
Merge pull request spillz#8 from stahta01/staging
PCH and Build fixes
2 parents b93bf17 + 2307000 commit 7301062

23 files changed

Lines changed: 128 additions & 123 deletions

‎PythonCodeCompletion/PythonCodeCompletion-unix.cbp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Add option="-fPIC" />
2121
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
2222
<Add directory="../XmlRpcEmbedder" />
23-
<Add directory="$(#cb)/include" />
23+
<Add directory="$(#cb.include)" />
2424
<Add directory="$(#cb)/sdk/wxscintilla/include" />
2525
</Compiler>
2626
<Linker>

‎PythonCodeCompletion/PythonCodeCompletion.cbp‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<Add option="-Winvalid-pch" />
2323
<Add option="-D__WXMSW__" />
2424
<Add option="-DWXUSINGDLL" />
25-
<Add option="-DWX_PRECOMP" />
2625
<Add option="-DwxUSE_UNICODE" />
2726
<Add option="-D_WINDOWS" />
28-
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
29-
<Add directory="$(#wx)/include" />
30-
<Add directory="$(#cb)/include" />
27+
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
28+
<Add directory="$(#wx.include)" />
29+
<Add directory="$(#cb.include)" />
30+
<Add directory="$(#cb.include)/tinyxml" />
3131
<Add directory="$(#cb)/sdk/wxscintilla/include" />
3232
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
3333
<Add directory="../XmlRpcEmbedder" />
@@ -36,7 +36,7 @@
3636
<Add library="wxmsw28u" />
3737
<Add library="codeblocks" />
3838
<Add library="XmlRpcEmbedder" />
39-
<Add directory="$(#wx)/lib/gcc_dll" />
39+
<Add directory="$(#wx.lib)/gcc_dll" />
4040
<Add directory="$(#cb)/devel" />
4141
</Linker>
4242
<ExtraCommands>
@@ -62,12 +62,11 @@
6262
<Add option="-Winvalid-pch" />
6363
<Add option="-D__WXMSW__" />
6464
<Add option="-DWXUSINGDLL" />
65-
<Add option="-DWX_PRECOMP" />
6665
<Add option="-DwxUSE_UNICODE" />
6766
<Add option="-D_WINDOWS" />
68-
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
69-
<Add directory="$(#wx)/include" />
70-
<Add directory="$(#cb)/include" />
67+
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
68+
<Add directory="$(#wx.include)" />
69+
<Add directory="$(#cb.include)" />
7170
<Add directory="$(#cb)/sdk/wxscintilla/include" />
7271
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
7372
<Add directory="../XmlRpcEmbedder" />
@@ -76,7 +75,7 @@
7675
<Add library="wxmsw28u" />
7776
<Add library="codeblocks" />
7877
<Add library="XmlRpcEmbedder" />
79-
<Add directory="$(#wx)/lib/gcc_dll" />
78+
<Add directory="$(#wx.lib)/gcc_dll" />
8079
<Add directory="$(#cb)/devel" />
8180
</Linker>
8281
<ExtraCommands>
@@ -89,6 +88,10 @@
8988
<VirtualTargets>
9089
<Add alias="All" targets="default;" />
9190
</VirtualTargets>
91+
<Compiler>
92+
<Add option="-std=gnu++11" />
93+
<Add option="-DNOPCH" />
94+
</Compiler>
9295
<Unit filename="PythonCodeCompletion.cpp" />
9396
<Unit filename="PythonCodeCompletion.h" />
9497
<Unit filename="manifest.xml" />

‎PythonCodeCompletion/PythonCodeCompletion.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#include <sdk.h> // Code::Blocks SDK
1+
#include <sdk.h> // Code::Blocks SDK
2+
#include <wx/menu.h>
3+
24
#include <configurationpanel.h>
35
#include "PythonCodeCompletion.h"
46

‎PythonCodeCompletion/PythonCodeCompletion.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
#ifndef PYTHON_CODE_COMPLETION_H_INCLUDED
1616
#define PYTHON_CODE_COMPLETION_H_INCLUDED
1717

18-
// For compilers that support precompilation, includes <wx/wx.h>
19-
#include <wx/wxprec.h>
20-
21-
#ifndef WX_PRECOMP
22-
#include <wx/wx.h>
23-
#endif
2418

2519
#include <cbplugin.h> // for "class cbPlugin"
2620
#include "xmlrpc_embedder.h"

‎PythonDebugger/PythonDebugger-unix.cbp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Compiler>
1717
<Add option="-ansi" />
1818
<Add option="-g" />
19-
<Add directory="$(#cb)/include" />
19+
<Add directory="$(#cb.include)" />
2020
<Add directory="$(#cb)/sdk/wxscintilla/include" />
2121
</Compiler>
2222
<Linker>

‎PythonDebugger/PythonDebugger.cbp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
<Add option="-DCB_PRECOMP" />
3131
<Add option="-DWX_PRECOMP" />
3232
<Add option="-DwxUSE_UNICODE" />
33-
<Add directory="$(#cb)/include" />
33+
<Add directory="$(#cb.include)" />
34+
<Add directory="$(#cb.include)/tinyxml" />
3435
<Add directory="$(#cb)/sdk/wxscintilla/include" />
3536
<Add directory="$(#wx.include)" />
3637
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
@@ -70,7 +71,8 @@
7071
<Add option="-DCB_PRECOMP" />
7172
<Add option="-DWX_PRECOMP" />
7273
<Add option="-DwxUSE_UNICODE" />
73-
<Add directory="$(#cb)/include" />
74+
<Add directory="$(#cb.include)" />
75+
<Add directory="$(#cb.include)/tinyxml" />
7476
<Add directory="$(#cb)/sdk/wxscintilla/include" />
7577
<Add directory="$(#wx.include)" />
7678
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
@@ -93,8 +95,8 @@
9395
</VirtualTargets>
9496
<Compiler>
9597
<Add option="-Wall" />
96-
<Add option="-DCB_PRECOMP" />
97-
<Add option="-DWX_PRECOMP" />
98+
<Add option="-std=gnu++11" />
99+
<Add option="-DNOPCH" />
98100
</Compiler>
99101
<Unit filename="PythonDebugger.cpp" />
100102
<Unit filename="PythonDebugger.h" />

‎PythonDebugger/PythonDebugger.cpp‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
#include <wx/process.h>
2+
#include <wx/regex.h>
3+
4+
#include <cbdebugger_interfaces.h>
5+
#include <cbeditor.h>
6+
#include <cbstyledtextctrl.h>
7+
#include <configurationpanel.h>
8+
#include <editormanager.h>
9+
#include <logmanager.h>
10+
//#include <watchesdlg.h>
11+
112
#include "PythonDebugger.h"
2-
#include <configurationpanel.h>
3-
#include <wx/regex.h>
4-
#include <cbdebugger_interfaces.h>
5-
#include <cbstyledtextctrl.h>
6-
//#include <watchesdlg.h>
713

814
// Register the plugin with Code::Blocks.
915
// We are using an anonymous namespace so we don't litter the global one.

‎PythonDebugger/PythonDebugger.h‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,15 @@
99

1010
#ifndef PYTHONDEBUGGER_H_INCLUDED
1111
#define PYTHONDEBUGGER_H_INCLUDED
12-
13-
// For compilers that support precompilation, includes <wx/wx.h>
14-
#include <wx/wxprec.h>
15-
16-
#ifndef WX_PRECOMP
17-
#include <wx/wx.h>
18-
#endif
12+
13+
#include <list>
14+
15+
#include <wx/stream.h>
16+
#include <wx/timer.h>
1917

2018
#include <cbplugin.h> // for "class cbPlugin/cbDebuggerPlugin"
2119
#include <loggers.h>
2220
#include <logger.h>
23-
#include <sdk.h>
2421

2522
#include <debuggermanager.h>
2623
#include "debuggeroptionsdlg.h"
@@ -35,7 +32,9 @@
3532
#define DBGCMDTYPE_USERCOMMAND 7
3633
#define DBGCMDTYPE_CALLSTACK 8
3734
#define DBGCMDTYPE_OTHER 9
38-
35+
36+
class wxProcessEvent;
37+
class wxTimerEvent;
3938

4039
typedef std::set<int> BPLtype;
4140

‎PythonInterpreter/PythonInterpCtrl.cpp‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
#include <wx/notebook.h>
22
#include <wx/textctrl.h>
33
#include <wx/regex.h>
4-
#include "PythonInterpCtrl.h"
5-
#include <globals.h>
4+
#include <wx/fontutil.h>
65

6+
#include <wx/wxscintilla.h>
77
#include <cbcolourmanager.h>
8+
#include <configmanager.h>
9+
#include <editorcolourset.h>
10+
#include <globals.h>
11+
#include <infowindow.h>
12+
#include <logmanager.h>
13+
14+
#include "PythonInterpCtrl.h"
15+
816

917
//DECLARE_LOCAL_EVENT_TYPE(wxEVT_PY_NOTIFY_UI_CODEOK, -1)
1018
DEFINE_EVENT_TYPE( wxEVT_PY_NOTIFY_UI_CODEOK )
@@ -166,17 +174,17 @@ PythonCodeCtrl::PythonCodeCtrl(wxWindow *parent, PythonInterpCtrl *py)
166174
if (mgr->ReadBool(_T("/camel_case"), false))
167175
{
168176
// consider CamelCase for both: cursor movement with CTRL and selection with CTRL+SHIFT:
169-
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_SCMOD_CTRL, wxSCI_CMD_WORDPARTLEFT);
170-
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_SCMOD_CTRL, wxSCI_CMD_WORDPARTRIGHT);
171-
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_SCMOD_CTRL|wxSCI_SCMOD_SHIFT, wxSCI_CMD_WORDPARTLEFTEXTEND);
172-
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_SCMOD_CTRL|wxSCI_SCMOD_SHIFT, wxSCI_CMD_WORDPARTRIGHTEXTEND);
177+
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_KEYMOD_CTRL, wxSCI_CMD_WORDPARTLEFT);
178+
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_KEYMOD_CTRL, wxSCI_CMD_WORDPARTRIGHT);
179+
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_KEYMOD_CTRL|wxSCI_KEYMOD_SHIFT, wxSCI_CMD_WORDPARTLEFTEXTEND);
180+
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_KEYMOD_CTRL|wxSCI_KEYMOD_SHIFT, wxSCI_CMD_WORDPARTRIGHTEXTEND);
173181
}
174182
else // else set default "none CamelCase" key behavior (also default scintilla behaviour, see scintilla docs)
175183
{
176-
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_SCMOD_CTRL, wxSCI_CMD_WORDLEFT);
177-
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_SCMOD_CTRL, wxSCI_CMD_WORDRIGHT);
178-
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_SCMOD_CTRL|wxSCI_SCMOD_SHIFT, wxSCI_CMD_WORDLEFTEXTEND);
179-
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_SCMOD_CTRL|wxSCI_SCMOD_SHIFT, wxSCI_CMD_WORDRIGHTEXTEND);
184+
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_KEYMOD_CTRL, wxSCI_CMD_WORDLEFT);
185+
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_KEYMOD_CTRL, wxSCI_CMD_WORDRIGHT);
186+
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_KEYMOD_CTRL|wxSCI_KEYMOD_SHIFT, wxSCI_CMD_WORDLEFTEXTEND);
187+
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_KEYMOD_CTRL|wxSCI_KEYMOD_SHIFT, wxSCI_CMD_WORDRIGHTEXTEND);
180188
}
181189

182190
SetUseTabs(mgr->ReadBool(_T("/use_tab"), false));
@@ -190,42 +198,42 @@ PythonCodeCtrl::PythonCodeCtrl(wxWindow *parent, PythonInterpCtrl *py)
190198
// otherwise to the start/end of the entire line.
191199
// alt+home/end go to start/end of the entire line.
192200
// in unwrapped mode, there is no difference between home/end and alt+home/end
193-
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_NORM, wxSCI_CMD_LINEENDWRAP);
194-
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_ALT, wxSCI_CMD_LINEEND);
195-
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_SHIFT, wxSCI_CMD_LINEENDWRAPEXTEND);
196-
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT, wxSCI_CMD_LINEENDEXTEND);
201+
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_NORM, wxSCI_CMD_LINEENDWRAP);
202+
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_ALT, wxSCI_CMD_LINEEND);
203+
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_SHIFT, wxSCI_CMD_LINEENDWRAPEXTEND);
204+
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT, wxSCI_CMD_LINEENDEXTEND);
197205

198206
// if user wants "Home" key to set cursor to the very beginning of line
199207
if (mgr->ReadBool(_T("/simplified_home"), false))
200208
{
201-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_NORM,wxSCI_CMD_HOMEWRAP);
202-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_ALT,wxSCI_CMD_HOME);
203-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT,wxSCI_CMD_HOMEWRAPEXTEND);
204-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT,wxSCI_CMD_HOMEEXTEND);
209+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_NORM,wxSCI_CMD_HOMEWRAP);
210+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_ALT,wxSCI_CMD_HOME);
211+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT,wxSCI_CMD_HOMEWRAPEXTEND);
212+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT,wxSCI_CMD_HOMEEXTEND);
205213
}
206214
else // else set default "Home" key behavior
207215
{
208-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_NORM,wxSCI_CMD_VCHOMEWRAP);
209-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_ALT,wxSCI_CMD_VCHOME);
210-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT,wxSCI_CMD_VCHOMEWRAPEXTEND);
211-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT,wxSCI_CMD_VCHOMEEXTEND);
216+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_NORM,wxSCI_CMD_VCHOMEWRAP);
217+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_ALT,wxSCI_CMD_VCHOME);
218+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT,wxSCI_CMD_VCHOMEWRAPEXTEND);
219+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT,wxSCI_CMD_VCHOMEEXTEND);
212220
}
213221
}
214222
else
215223
{ // in word wrap mode, home/end keys goto start/end of the entire line. alt+home/end goes to wrap points
216-
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_ALT, wxSCI_CMD_LINEENDWRAP);
217-
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT, wxSCI_CMD_LINEENDWRAPEXTEND);
224+
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_ALT, wxSCI_CMD_LINEENDWRAP);
225+
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT, wxSCI_CMD_LINEENDWRAPEXTEND);
218226

219227
// if user wants "Home" key to set cursor to the very beginning of line
220228
if (mgr->ReadBool(_T("/simplified_home"), false))
221229
{
222-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_ALT,wxSCI_CMD_HOMEWRAP);
223-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT,wxSCI_CMD_HOMEWRAPEXTEND);
230+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_ALT,wxSCI_CMD_HOMEWRAP);
231+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT,wxSCI_CMD_HOMEWRAPEXTEND);
224232
}
225233
else // else set default "Home" key behavior
226234
{
227-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_ALT,wxSCI_CMD_VCHOMEWRAP);
228-
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT,wxSCI_CMD_VCHOMEWRAPEXTEND);
235+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_ALT,wxSCI_CMD_VCHOMEWRAP);
236+
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT,wxSCI_CMD_VCHOMEWRAPEXTEND);
229237
}
230238
}
231239
SetViewEOL(mgr->ReadBool(_T("/show_eol"), false));
@@ -241,7 +249,7 @@ PythonCodeCtrl::PythonCodeCtrl(wxWindow *parent, PythonInterpCtrl *py)
241249
SetTabWidth(mgr->ReadInt(_T("/tab_size"), 4));
242250
SetIndent(mgr->ReadInt(_T("/tab_size"), 4)); //NEEDED FOR AUTO INDENTATION (NOT IN CB EDITOR)
243251

244-
em->GetColourSet()->Apply(_("Python"),this);
252+
em->GetColourSet()->Apply(HighlightLanguage(wxT("Python")),this, false, true);
245253

246254
}
247255

‎PythonInterpreter/PythonInterpCtrl.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
#ifndef PPCTRL_H
22
#define PPCTRL_H
33

4-
#include <wx/wxprec.h>
5-
6-
#ifndef WX_PRECOMP
7-
#include <wx/wx.h>
4+
#ifndef WX_PRECOMP
5+
#include <wx/splitter.h>
86
#endif
97

108
#include "xmlrpc_embedder.h"
119
#include "ShellCtrlBase.h"
1210
#include "editormanager.h"
1311
#include "cbstyledtextctrl.h"
1412

15-
#include <sdk.h>
16-
1713
class PythonInterpCtrl;
1814

1915
class PythonCodeCtrl: public cbStyledTextCtrl

0 commit comments

Comments
 (0)