src/CodeBlocks_wx31.cbp | 42 ++++++++++++++++++++++++++++++---
src/sdk/wxscintilla/src/ScintillaWX.cpp | 4 ++--
src/sdk/wxscintilla/src/wxscintilla.cpp | 4 +++-
3 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/CodeBlocks_wx31.cbp b/src/CodeBlocks_wx31.cbp
index f4b2ceb41..23a0771d3 100644
--- a/src/CodeBlocks_wx31.cbp
+++ b/src/CodeBlocks_wx31.cbp
@@ -3334,6 +3334,9 @@
<Unit filename="sdk/wxscintilla/src/scintilla/include/SciLexer.h">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/include/Sci_Position.h">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/include/Scintilla.h">
<Option target="scintilla" />
</Unit>
@@ -3379,6 +3382,9 @@
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexBasic.cxx">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexBatch.cxx">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexBibTeX.cxx">
<Option target="scintilla" />
</Unit>
@@ -3424,9 +3430,15 @@
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexDMIS.cxx">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexDiff.cxx">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexECL.cxx">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexEDIFACT.cxx">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexEScript.cxx">
<Option target="scintilla" />
</Unit>
@@ -3436,6 +3448,9 @@
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexErlang.cxx">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexErrorList.cxx">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexFlagship.cxx">
<Option target="scintilla" />
</Unit>
@@ -3460,9 +3475,15 @@
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexHex.cxx">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexIndent.cxx">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexInno.cxx">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexJSON.cxx">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexKVIrc.cxx">
<Option target="scintilla" />
</Unit>
@@ -3493,6 +3514,9 @@
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexMagik.cxx">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexMake.cxx">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexMarkdown.cxx">
<Option target="scintilla" />
</Unit>
@@ -3514,13 +3538,13 @@
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexNsis.cxx">
<Option target="scintilla" />
</Unit>
- <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexOScript.cxx">
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexNull.cxx">
<Option target="scintilla" />
</Unit>
- <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexOpal.cxx">
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexOScript.cxx">
<Option target="scintilla" />
</Unit>
- <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexOthers.cxx">
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexOpal.cxx">
<Option target="scintilla" />
</Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexPB.cxx">
@@ -3553,6 +3577,9 @@
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexProgress.cxx">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexProps.cxx">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/lexers/LexPython.cxx">
<Option target="scintilla" />
</Unit>
@@ -3826,6 +3853,9 @@
<Unit filename="sdk/wxscintilla/src/scintilla/src/PerLine.h">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/src/Position.h">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/src/PositionCache.cxx">
<Option target="scintilla" />
</Unit>
@@ -3856,6 +3886,9 @@
<Unit filename="sdk/wxscintilla/src/scintilla/src/Selection.h">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/src/SparseVector.h">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/src/SplitVector.h">
<Option target="scintilla" />
</Unit>
@@ -3874,6 +3907,9 @@
<Unit filename="sdk/wxscintilla/src/scintilla/src/UnicodeFromUTF8.h">
<Option target="scintilla" />
</Unit>
+ <Unit filename="sdk/wxscintilla/src/scintilla/src/UniqueString.h">
+ <Option target="scintilla" />
+ </Unit>
<Unit filename="sdk/wxscintilla/src/scintilla/src/ViewStyle.cxx">
<Option target="scintilla" />
</Unit>
diff --git a/src/sdk/wxscintilla/src/ScintillaWX.cpp b/src/sdk/wxscintilla/src/ScintillaWX.cpp
index 4c89076b3..10378c661 100644
--- a/src/sdk/wxscintilla/src/ScintillaWX.cpp
+++ b/src/sdk/wxscintilla/src/ScintillaWX.cpp
@@ -734,7 +734,7 @@ bool ScintillaWX::CreateSystemCaret() {
delete [] bits;
BOOL retval = ::CreateCaret(GetHwndOf(stc), sysCaretBitmap,
sysCaretWidth, sysCaretHeight);
- ::ShowCaret(GetHwndOf(sci));
+ ::ShowCaret(GetHwndOf(stc));
return retval != 0;
#else
return false;
@@ -745,7 +745,7 @@ bool ScintillaWX::DestroySystemCaret() {
#ifdef __WXMSW__
if (sysCaretBitmap)
{
- ::HideCaret(GetHwndOf(sci));
+ ::HideCaret(GetHwndOf(stc));
BOOL retval = ::DestroyCaret();
if (sysCaretBitmap) {
::DeleteObject(sysCaretBitmap);
diff --git a/src/sdk/wxscintilla/src/wxscintilla.cpp b/src/sdk/wxscintilla/src/wxscintilla.cpp
index 07de6b3ae..fa6cd7c9e 100644
--- a/src/sdk/wxscintilla/src/wxscintilla.cpp
+++ b/src/sdk/wxscintilla/src/wxscintilla.cpp
@@ -110,7 +110,7 @@ DEFINE_EVENT_TYPE( wxEVT_SCI_MARGINCLICK );
DEFINE_EVENT_TYPE( wxEVT_SCI_NEEDSHOWN );
DEFINE_EVENT_TYPE( wxEVT_SCI_PAINTED );
DEFINE_EVENT_TYPE( wxEVT_SCI_USERLISTSELECTION );
-DEFINE_EVENT_TYPE( wxEVT_SCI_URIDROPPED );
+//DEFINE_EVENT_TYPE( wxEVT_SCI_URIDROPPED );
DEFINE_EVENT_TYPE( wxEVT_SCI_DWELLSTART );
DEFINE_EVENT_TYPE( wxEVT_SCI_DWELLEND );
DEFINE_EVENT_TYPE( wxEVT_SCI_START_DRAG );
@@ -5271,6 +5271,7 @@ void wxScintilla::AppendTextRaw(const char* text, int length)
}
#if WXWIN_COMPATIBILITY_3_0
+#if 0
// Deprecated since Scintilla 3.7.2
void wxScintilla::UsePopUp(bool allowPopUp)
{
@@ -5284,6 +5285,7 @@ void wxScintilla::StartStyling(int start, int unused)
SendMsg(SCI_STARTSTYLING, start, unused);
}
+#endif // 0
#endif // WXWIN_COMPATIBILITY_3_0
//----------------------------------------------------------------------
+//DEFINE_EVENT_TYPE( wxEVT_SCI_URIDROPPED );void wxScintilla::UsePopUp(bool allowPopUp)
void wxScintilla::StartStyling(int start, int unused)
sdk\wxscintilla\include/wx/wxscintilla.h:5613:51: warning: 'wxEVT_SCI_KEY' is deprecated: Don't handle wxEVT_SCI_KEY. It's never generated. [-Wdeprecated-declarations]
Release 4.0.0Those timers are deleted in 4.0.0?
Released 16 August 2017.
This is an unstable release with changes to interfaces used for lexers and platform access. Some more changes may occur to internal and external interfaces before stability is regained with 4.1.0.
Uses C++14 features. Requires Microsoft Visual C++ 2017, GCC 7, and Clang 4.0 or newer.
Support dropped for GTK+ versions before 2.24.
The lexer interfaces ILexer and ILexerWithSubStyles, along with additional style metadata methods, were merged into ILexer4. Most lexers will need to be updated to match the new interfaces.
The IDocumentWithLineEnd interface was merged into IDocument.
The platform layer interface has changed with unused methods removed, a new mechanism for reporting events, removal of methods that take individual keyboard modifiers, and removal of old timer methods.
Those timers are deleted in 4.0.0?I did not look into the code, but we talk about 3.7.5 and not the coming 4.0.0, if I read it correctly. So they might still be needed.
I have to comment the lineCodeBecause this is defined in the wx3.1, thus it cause conflict.+//DEFINE_EVENT_TYPE( wxEVT_SCI_URIDROPPED );
I have also comment out the two function bodyCodeBecause they also cause build error.void wxScintilla::UsePopUp(bool allowPopUp)
void wxScintilla::StartStyling(int start, int unused)
But I see a lot of warnings like:Can you paste the lines of the build log which mention the uses of these deprecated declarations?Codesdk\wxscintilla\include/wx/wxscintilla.h:5613:51: warning: 'wxEVT_SCI_KEY' is deprecated: Don't handle wxEVT_SCI_KEY. It's never generated. [-Wdeprecated-declarations]
Question: at svn rev9896, some timers were added, I'm not sure those timers are still needed. I download a Scintilla 3.7.6 source code, and I see some platform like ScintillaWin, ScintillaGTK are still have those timers. (FineTickerAvailable() function get overwrite by those platforms, and return true)The code in this branch is 99% the same as the code for wxstc in wxwidgets master branch.
But from the document here: Scintilla and SciTE (http://www.scintilla.org/ScintillaHistory.html)We don't care for 4.x.x at the moment. It requires c++14 or 17 compiler and we can't use those because we need to support old linux distros.QuoteRelease 4.0.0 ....
I have to comment the line
Code: [Select]
+//DEFINE_EVENT_TYPE( wxEVT_SCI_URIDROPPED );
Because this is defined in the wx3.1, thus it cause conflict.
# Set the current styling position to pos and the styling mask to mask.
# The styling mask can be used to protect some bits in each styling byte from modification.
fun void StartStyling=2032(position pos, int mask)# Set the current styling position to start.
# The unused parameter is no longer used and should be set to 0.
fun void StartStyling=2032(position start, int unused)# Set whether a pop up menu is displayed automatically when the user presses
# the wrong mouse button.
fun void UsePopUp=2371(bool allowPopUp,)# Set whether a pop up menu is displayed automatically when the user presses
# the wrong mouse button on certain areas.
fun void UsePopUp=2371(int popUpMode,)
Is the final goal to use the wx integrated scintilla component? Is this even possible?We could switch to this component but will face major 2 drawbacks
Which branch are you testing the one with all the patches or the one without them?https://github.com/obfuscated/codeblocks_sf/tree/scintilla_3_7_5
||=== Générer : default dans FileManager Plugin wx2.8.x (compilateur : GNU GCC Compiler) ===|
C:\Users\Gerard\Documents\CodeBlocks_SVN\CodeBlocks_src\src\plugins\contrib\FileManager\FileExplorerUpdater.cpp||In member function 'bool FileExplorerUpdater::GetCurrentState(const wxString&)':|
C:\Users\Gerard\Documents\CodeBlocks_SVN\CodeBlocks_src\src\plugins\contrib\FileManager\FileExplorerUpdater.cpp|221|warning: unused variable 'is_cvs' [-Wunused-variable]|
C:\Users\Gerard\Documents\CodeBlocks_SVN\CodeBlocks_src\src\plugins\contrib\FileManager\FileExplorerUpdater.cpp|222|warning: variable 'is_git' set but not used [-Wunused-but-set-variable]|
||=== Générer : default dans FortranProject (compilateur : GNU GCC Compiler) ===|
C:\Users\Gerard\Documents\CodeBlocks_SVN\CodeBlocks_src\src\plugins\contrib\FortranProject\constrhighlighter.cpp||In member function 'void ConstrHighlighter::DoWork(cbEditor*, FortranSourceForm)':|
C:\Users\Gerard\Documents\CodeBlocks_SVN\CodeBlocks_src\src\plugins\contrib\FortranProject\constrhighlighter.cpp|308|error: 'wxSCI_INDIC_HIGHLIGHT' was not declared in this scope|
||=== Génération de terminé : 1 erreur(s), 29 avertissement(s) (6 minute(s), 17 seconde(s)) ===|
||=== Générer : sdk dans Code::Blocks wx3.0.x (compilateur : GNU GCC Compiler) ===|
.objs30\sdk\configmanager-revision.o:configmanager-revision.cpp:(.text$_ZN20wxObjectEventFunctorD1Ev[__ZN20wxObjectEventFunctorD1Ev]+0xa)||undefined reference to `wxEventFunctor::~wxEventFunctor()'|
.objs30\sdk\configmanager-revision.o:configmanager-revision.cpp:(.text$_ZN20wxObjectEventFunctorD0Ev[__ZN20wxObjectEventFunctorD0Ev]+0xd)||undefined reference to `wxEventFunctor::~wxEventFunctor()'|
||error: ld returned 1 exit status|
||=== Génération de échoué : 3 erreur(s), 0 avertissement(s) (1 minute(s), 58 seconde(s)) ===|
||=== Générer : default dans FortranProject wx3.0.x (64 bit) (compilateur : GNU GCC Compiler) ===|
C:\Users\Gerard\Documents\CodeBlocks_SVN\CodeBlocks_src\src\plugins\contrib\FortranProject\constrhighlighter.cpp||In member function 'void ConstrHighlighter::DoWork(cbEditor*, FortranSourceForm)':|
C:\Users\Gerard\Documents\CodeBlocks_SVN\CodeBlocks_src\src\plugins\contrib\FortranProject\constrhighlighter.cpp|308|error: 'wxSCI_INDIC_HIGHLIGHT' was not declared in this scope|
||=== Génération de terminé : 1 erreur(s), 4 avertissement(s) (12 minute(s), 57 seconde(s)) ===|
Index: constrhighlighter.cpp
===================================================================
--- constrhighlighter.cpp (revision 186)
+++ constrhighlighter.cpp (working copy)
@@ -305,7 +305,7 @@
return;
control->SetIndicatorCurrent(m_IndicFound);
- control->IndicatorSetStyle(m_IndicFound, wxSCI_INDIC_HIGHLIGHT);
+ control->IndicatorSetStyle(m_IndicFound, wxSCI_INDIC_ROUNDBOX);
if (foundFull)
control->IndicatorSetForeground(m_IndicFound, m_FullColour);
else