diff options
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 8 | ||||
| -rw-r--r-- | src/LexEiffel.cxx | 3 | ||||
| -rw-r--r-- | src/ScintillaBase.cxx | 1 | ||||
| -rw-r--r-- | win32/ExternalLexer.cxx | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index ea1981dc5..4c0ac43fe 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -849,7 +849,13 @@ void ScintillaGTK::ReceivedDrop(GtkSelectionData *selection_data) { Redraw(); } -void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, char *text, bool isRectangular) { +// Preprocessor used to avoid warnings here +#ifdef _MSC_VER +void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, char *text, bool) +#else +void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, char *text, bool isRectangular) +#endif +{ char *selBuffer = text; char *tmpBuffer = NULL; // Buffer to be freed diff --git a/src/LexEiffel.cxx b/src/LexEiffel.cxx index 6109ca4d5..68572db65 100644 --- a/src/LexEiffel.cxx +++ b/src/LexEiffel.cxx @@ -48,6 +48,9 @@ class LexContext { Accessor &styler; int lengthDoc; int currentPos; + LexContext& operator=(const LexContext&) { + return *this; + } public: int state; char ch; diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index 2840e08fb..db8040340 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -466,7 +466,6 @@ sptr_t ScintillaBase::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPara case SCI_AUTOCGETAUTOHIDE: return ac.autoHide; - break; case SCI_CALLTIPSHOW: { AutoCompleteCancel(); diff --git a/win32/ExternalLexer.cxx b/win32/ExternalLexer.cxx index 871ddf1a0..d6df40343 100644 --- a/win32/ExternalLexer.cxx +++ b/win32/ExternalLexer.cxx @@ -242,13 +242,12 @@ void LexerManager::EnumerateLexers() { if (hFind != INVALID_HANDLE_VALUE) { //Found the first file... BOOL found = TRUE; - LexerLibrary *lib = NULL; SString to_open; while (found) { to_open.assign(sPath); to_open += FindFileData.cFileName; - lib = new LexerLibrary(to_open.c_str()); + LexerLibrary *lib = new LexerLibrary(to_open.c_str()); if (NULL != first) { last->next = lib; last = lib; |