diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 3 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 3 | ||||
| -rw-r--r-- | include/ScintillaWidget.h | 9 | ||||
| -rw-r--r-- | test/gi/makefile | 2 | 
4 files changed, 9 insertions, 8 deletions
| diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 29e664b12..1a3549a31 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -504,6 +504,9 @@  	the document is already styled when the user scrolls to it.  	</li>  	<li> +	Support GObject introspection on GTK+. +	</li> +	<li>  	Bash lexer flags incomplete here doc delimiters as syntax errors.  	<a href="http://sourceforge.net/p/scintilla/bugs/1789/">Bug #1789</a>.  	</li> diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 6a9ff2ac4..831ae5d1a 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -3065,7 +3065,6 @@ sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_  }  sptr_t scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { -  	return scintilla_send_message(sci, iMessage, wParam, lParam);  } @@ -3106,7 +3105,6 @@ GType scintilla_get_type() {  }  GType scintilla_object_get_type() { -  	return scintilla_get_type();  } @@ -3223,7 +3221,6 @@ GtkWidget* scintilla_new() {  }  GtkWidget *scintilla_object_new() { -  	return scintilla_new();  } diff --git a/include/ScintillaWidget.h b/include/ScintillaWidget.h index 87c70917c..2c3d12dbe 100644 --- a/include/ScintillaWidget.h +++ b/include/ScintillaWidget.h @@ -1,8 +1,9 @@  /* Scintilla source code edit control */ -/** @file ScintillaWidget.h - ** Definition of Scintilla widget for GTK+. - ** Only needed by GTK+ code but is harmless on other platforms. - **/ +/* @file ScintillaWidget.h + * Definition of Scintilla widget for GTK+. + * Only needed by GTK+ code but is harmless on other platforms. + * This comment is not a doc-comment as that causes warnings from g-ir-scanner. + */  /* Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>   * The License.txt file describes the conditions under which this software may be distributed. */ diff --git a/test/gi/makefile b/test/gi/makefile index 44277fbbc..cf7522303 100644 --- a/test/gi/makefile +++ b/test/gi/makefile @@ -36,7 +36,7 @@ clean:  	$(MAKE) -C ../../gtk clean  test: Scintilla-0.1.gir -	@echo Verifing Scintilla-0.1.gir file +	@echo Verifying Scintilla-0.1.gir file  	@diff $^.good $^ || (echo "GIR FILE MISMATCH!"; exit 1)  	@echo Launching gi-test.py python program  	GI_TYPELIB_PATH=$(PWD) LD_LIBRARY_PATH=$(PWD) \ | 
