Commit 2de83a99 authored by Jody Goldberg's avatar Jody Goldberg

more cleanup

svn path=/trunk/; revision=15640
parent fdf18c51
......@@ -868,14 +868,6 @@ if test "x$python_msg" = xyes; then
BIG_CHECKING(Look for $PY_INCLUDE/Python.h)
if test -f $PY_INCLUDE/Python.h; then
AC_MSG_RESULT(yes)
PY_LIBS="python$PY_VERSION"
PY_LIB_LOC=`$PYTHON -c 'from distutils.sysconfig import get_config_var; sys.stdout.write( get_config_var("LIBPL"))'`
PY_LIB_LOC="-L$PY_LIB_LOC"
PY_CFLAGS="-I$PY_INCLUDE"
[echo 'echo_python_libs:
@echo $(MODLIBS) $(LIBS)' >confmake.tmp
PY_EXTRA_LIBS=`make -s -f confmake.tmp -f "$PY_MAKEFILE"`
rm -f confmake.tmp]
else
AC_MSG_RESULT(no)
python_msg="unable to find Python.h"
......@@ -884,6 +876,16 @@ fi
if test "x$python_msg" = xyes; then
BIG_CHECKING(if we can build a shared library depending on libpython)
PY_LIBS="python$PY_VERSION"
PY_LIB_LOC=`$PYTHON -c 'import sys ; from distutils.sysconfig import get_config_var; sys.stdout.write( get_config_var("LIBPL"))'`
PY_LIB_LOC="-L$PY_LIB_LOC"
PY_CFLAGS="-I$PY_INCLUDE"
[echo 'echo_python_libs:
@echo $(MODLIBS) $(LIBS)' >confmake.tmp
PY_EXTRA_LIBS=`make -s -f confmake.tmp -f "$PY_MAKEFILE"`
rm -f confmake.tmp]
rm -rf testpython
mkdir testpython
cd testpython
......
......@@ -44,7 +44,7 @@ struct _WorkbookControlGUI {
gboolean updating_ui;
/* Auto completion */
void *auto_complete; /* GtkType is (Complete *) */
GObject *auto_complete; /* GType is (Complete *) */
gboolean auto_completing;
char *auto_complete_text;
......
......@@ -327,7 +327,7 @@ cb_entry_changed (GtkEntry *entry, WorkbookControlGUI *wbcg)
wbcg->auto_max_size = text_len;
if (wbv->do_auto_completion && wbcg->auto_completing)
complete_start (wbcg->auto_complete, text);
complete_start (COMPLETE (wbcg->auto_complete), text);
}
static gboolean
......@@ -945,7 +945,7 @@ wbcg_edit_start (WorkbookControlGUI *wbcg,
if (cursorp && /* autocompletion code will not work in the edit line */
wbv->do_auto_completion &&
(text == NULL || g_unichar_isalpha (g_utf8_get_char (text)))) {
wbcg->auto_complete = complete_sheet_new (
wbcg->auto_complete = (GObject *)complete_sheet_new (
sv->sheet, col, row,
workbook_edit_complete_notify, wbcg);
wbcg->auto_completing = TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment