Skip to content

Commit 4b03b2a

Browse files
jcupittjcupitt
committed
remove gtksheet
just use treeview now ... gtksheet would never work with gtk3, and was totally broken on Windows
1 parent 4247d7d commit 4b03b2a

13 files changed

+1
-14899
lines changed

‎configure.ac

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -179,26 +179,6 @@ if test x"$nip_use_infobar" = x"yes"; then
179179
AC_DEFINE(USE_INFOBAR,1,[define if you have GtkInfoBar])
180180
fi
181181

182-
# building without gtksheet is an option
183-
AC_ARG_WITH([gtksheet], AS_HELP_STRING([--without-gtksheet], [build without gtksheet (default: test)]))
184-
185-
# GtkEntryBuffer was added in gtk 2.18
186-
# we need it for our hacked-about gtksheet widget ... fall back to a treeview
187-
# matrix widget if we have to
188-
if test "x$with_gtksheet" != "xno"; then
189-
PKG_CHECK_EXISTS(gtk+-2.0 >= 2.18,
190-
[with_gtksheet=yes],
191-
[with_gtksheet=no]
192-
)
193-
fi
194-
195-
if test x"$with_gtksheet" = x"no"; then
196-
AM_CONDITIONAL(USE_GTKSHEET, false)
197-
else
198-
AC_DEFINE(USE_GTKSHEET,1,[define if you have GtkEntryBuffer])
199-
AM_CONDITIONAL(USE_GTKSHEET, true)
200-
fi
201-
202182
# GRegex was added in glib-2.14
203183
# we need it for regex searching in the program window
204184
PKG_CHECK_EXISTS(glib-2.0 >= 2.14,
@@ -385,8 +365,6 @@ use gsl for numeric functions: $with_gsl
385365
use libgoffice to show plots: $with_libgoffice
386366
use libgvc to show ws dep graphs: $with_libgvc
387367
(requires gvc < 2.30)
388-
use gtksheet to show matrices: $with_gtksheet
389-
(requires gtk+-2.0 >= 2.18)
390368
use gtkinfobar to show messages: $nip_use_infobar
391369
(requires gtk+-2.0 >= 2.18)
392370
allow regex searches: $nip_use_gregex

‎src/Makefile.am

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,7 @@ bin_PROGRAMS = nip2
2020
CLI_DIST = nip2-cli.c
2121
endif
2222

23-
# the sources we have to copy-paste in here from gtksheet
24-
gtksheet_generated_h_sources = \
25-
gtksheet-marshal.h \
26-
gtksheettypebuiltins.h
27-
28-
gtksheet_generated_c_sources = \
29-
gtksheet-marshal.c \
30-
gtksheettypebuiltins.c
31-
32-
gtksheet_public_h_sources = \
33-
gtksheet.h \
34-
gtksheetfeatures.h \
35-
gtksheetwidget.h \
36-
gtkitementry.h
37-
38-
gtksheet_c_sources = \
39-
gtksheet.c \
40-
gtksheetwidget.c \
41-
gtkitementry.c
42-
43-
my_sources = \
23+
nip2_SOURCES = \
4424
vipsobject.c \
4525
vipsobject.h \
4626
plotmodel.c \
@@ -314,51 +294,13 @@ my_sources = \
314294
workspaceview.c \
315295
workspaceview.h
316296

317-
# gtksheet needs GtkEntryBuffer, which is in gtk+-2.18 and later
318-
# on earlier gtks we fall back to a table plus a lot of entry widgets
319-
if USE_GTKSHEET
320-
nip2_SOURCES = \
321-
$(gtksheet_public_h_sources) \
322-
$(gtksheet_c_sources) \
323-
$(gtksheet_generated_h_sources) \
324-
$(gtksheet_generated_c_sources) \
325-
$(my_sources)
326-
else
327-
nip2_SOURCES = \
328-
$(my_sources)
329-
endif
330-
331297
helpindex.h:
332298
./makehelpindex.pl $(prefix) > helpindex.h
333299
nipmarshal.h:
334300
glib-genmarshal --prefix=nip --header nipmarshal.list > nipmarshal.h
335301
nipmarshal.c:
336302
echo "#include \"nipmarshal.h\"" > nipmarshal.c
337303
glib-genmarshal --prefix=nip --body nipmarshal.list >> nipmarshal.c
338-
gtksheet-marshal.h:
339-
glib-genmarshal --prefix=gtksheet --header gtksheet-marshal.list > \
340-
gtksheet-marshal.h
341-
gtksheet-marshal.c:
342-
echo "#include \"gtksheet-marshal.h\"" > gtksheet-marshal.c
343-
glib-genmarshal --prefix=gtksheet --body gtksheet-marshal.list >> \
344-
gtksheet-marshal.c
345-
346-
gtksheettypebuiltins.h: $(gtksheet_public_h_sources)
347-
( glib-mkenums \
348-
--fhead "#ifndef __GTKSHEET_TYPE_BUILTINS_H__\n#define __GTKSHEET_TYPE_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
349-
--fprod "/* enumerations from \"@filename@\" */\n" \
350-
--vhead "GType @enum_name@_get_type (void);\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
351-
--ftail "G_END_DECLS\n\n#endif /* __GTKSHEET_TYPE_BUILTINS_H__ */" \
352-
$(gtksheet_public_h_sources) ) > gtksheettypebuiltins.h
353-
354-
gtksheettypebuiltins.c: $(gtksheet_public_h_sources)
355-
( glib-mkenums \
356-
--fhead "#define GTKSHEET_ENABLE_BROKEN\n#include \"gtksheet.h\"" \
357-
--fprod "\n/* enumerations from \"@filename@\" */" \
358-
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
359-
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
360-
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
361-
$(gtksheet_public_h_sources) ) > gtksheettypebuiltins.c
362304

363305
nip2-icon.rc:
364306
echo 1 ICON \"nip2-icon.ico\" > nip2-icon.rc
@@ -388,5 +330,4 @@ CLEANFILES = parse.c parse.h lex.c tags
388330

389331
EXTRA_DIST = makehelpindex.pl helpindex.h run-nip2.sh \
390332
nipmarshal.h nipmarshal.c nipmarshal.list \
391-
gtksheet-marshal.h gtksheet-marshal.c gtksheet-marshal.list \
392333
$(CLI_DIST)

0 commit comments

Comments
 (0)