dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated for GTK2 build 

2001-07-28  Hans Breuer  <hans@breuer.org>

	* */*/makefile.msc : updated for GTK2 build

	* app/widgets/makefile.msc : (new file) forgot this one last time

	* plug-ins/common/animationplay.c : reflect that GTK2 has its
	gdk<x|win32|fb>.h files in the back-end sub directories

	* plug-ins/common/gif.c :
	* plug-ins/common/jpeg.c :
	* plug-ins/dbbrowser/dbbrowser_utils.c :
	* plug-ins/gap/gap_dbbrowser_utils.c :
	* plug-ims/gimpressionist/presets.c :
	* plug-ims/gimpressionist/imap_setting.c :
	* plug-ims/gimpressionist/imap_source.c :
	* plug-ims/script-fu/script-fu-console.c :
	* plug-ims/script-fu/script-fu-scripts.c : #define GTK_ENABLE_BROKEN
	and include <gtk/gtktext.h> to make them compile/work again

	* plug-ins/common/spheredesigner.c : gtk_color_selction_set_opacity
	renamed to gtk_color_selction_set_current_alpha

	* plug-ins/gflare/gtkmultioptionmenu.c : ported ny removing the
	virtual draw function and style->xthickness and ythickness via
	direct access, klass field isn't available anymore

	* plug-ins/common/nlfilt.c :
	* plug-ims/gap/gap_movdialog.c :
	* plug-ims/gimpressionist/gimpressionist.c : gtk_widget_set_default_visible is
	neither available nor needed anymore

	* plug-ins/common/plugindetails.c : ported to GtkTextBuffer
	and reflect gtk_paned api changes

	* plug-ims/gimpressionist/imap_preview.c : replace GTK_WIDGET(a)->klass
	access by GTK_WIDGET_GET_CLASS(a)

	* plug-ims/gimpressionist/imap_selection.c :
	* plug-ims/gimpressionist/imap_toolbar.c :
	* plug-ims/gimpressionist/imap_tools.c : gtk_toolbar api changes
This commit is contained in:
Hans Breuer 2001-07-28 19:40:07 +00:00 committed by Hans Breuer
parent 652d670abf
commit 95a8c72405
45 changed files with 283 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/core/makefile.msc
View File

@ -11,7 +11,7 @@ includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \
$(GLIB_LIBS) $(GTK_LIBS) \
$(GLIB_LIBS) $(GTK2_LIBS) \
..\base\appbase-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
@ -82,7 +82,7 @@ OTHER_FILES = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir)
all : \

4
app/gui/makefile.msc
View File

@ -11,7 +11,7 @@ includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \
$(GLIB_LIBS) $(GTK_LIBS) $(INTL_LIBS) \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
..\base\appbase-$(PKG_VER).lib \
..\core\appcore-$(PKG_VER).lib \
@ -74,7 +74,7 @@ OBJECTS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir)
all : \

5
app/makefile.msc
View File

@ -35,7 +35,8 @@ PKG_LINK = \
$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(GTK2_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTLLIBS)\
@ -46,7 +47,7 @@ gimp_LDFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir)
regex_sources = \

2
app/paint-funcs/makefile.msc
View File

@ -24,7 +24,7 @@ PKG_LINK = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir)
all : \

4
app/pdb/makefile.msc
View File

@ -11,7 +11,7 @@ includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \
$(GLIB_LIBS) $(GTK_LIBS) $(INTL_LIBS) \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
..\..\libgimpmath\gimpmath-$(PKG_VER).lib \
@ -62,7 +62,7 @@ OBJECTS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir)
all : \

4
app/tools/makefile.msc
View File

@ -11,7 +11,7 @@ includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \
$(GLIB_LIBS) $(GTK_LIBS) $(INTL_LIBS) \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
..\..\libgimpmath\gimpmath-$(PKG_VER).lib \
@ -81,7 +81,7 @@ OBJECTS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir)
all : \

95
app/widgets/makefile.msc Normal file
View File

@ -0,0 +1,95 @@
# autogenerated from automake.am with automake.py
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appwidgets
PKG_VER = 1.3
!INCLUDE $(TOP)\build\win32\make.msc
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
..\base\appbase-$(PKG_VER).lib \
..\core\appcore-$(PKG_VER).lib \
..\gui\appgui-$(PKG_VER).lib
OBJECTS = \
gimpbrushfactoryview.obj \
gimpbrushpreview.obj \
gimpbufferpreview.obj \
gimpbufferview.obj \
gimpchannellistitem.obj \
gimpchannellistview.obj \
gimpcolorpanel.obj \
gimpcomponentlistitem.obj \
gimpcontainereditor.obj \
gimpcontainergridview.obj \
gimpcontainerlistview.obj \
gimpcontainermenu.obj \
gimpcontainermenuimpl.obj \
gimpcontainerview.obj \
gimpcontainerview-utils.obj \
gimpcursor.obj \
gimpdatafactoryview.obj \
gimpdialogfactory.obj \
gimpdnd.obj \
gimpdock.obj \
gimpdockable.obj \
gimpdockbook.obj \
gimpdrawablelistitem.obj \
gimpdrawablelistview.obj \
gimpdrawablepreview.obj \
gimpgradientpreview.obj \
gimphistogramview.obj \
gimpimagedock.obj \
gimpimagepreview.obj \
gimplayerlistitem.obj \
gimplayerlistview.obj \
gimplistitem.obj \
gimpmenuitem.obj \
gimpnavigationpreview.obj \
gimppalettepreview.obj \
gimppatternpreview.obj \
gimppreview.obj \
gimptoolinfopreview.obj \
gimpwidgets-constructors.obj \
gimpwidgets-utils.obj \
gtkwrapbox.obj \
gtkhwrapbox.obj \
gtkvwrapbox.obj \
gimpconstrainedhwrapbox.obj \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK2_CFLAGS) \
-I$(includedir)
all : \
$(PRJ_TOP)\config.h \
$(PACKAGE).lib \
$(PACKAGE)-$(PKG_VER).dll
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
RESOURCE = $(PACKAGE).res
$(PACKAGE).lib : $(OBJECTS)
lib /out:$(PACKAGE).lib $(OBJECTS)
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<

2
app/xcf/makefile.msc
View File

@ -12,7 +12,7 @@ LT_RELEASE = $(PKG_VER)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir) \
OBJECTS = \

4
libgimp/gimpprocbrowserdialog.c
View File

@ -35,6 +35,10 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
/* configuration */
#define DBL_LIST_WIDTH 220

4
libgimp/gimpprocview.c
View File

@ -35,6 +35,10 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
/* configuration */
#define DBL_LIST_WIDTH 220

4
libgimp/makefile.msc
View File

@ -21,7 +21,7 @@ GIMPDIR = _gimp$(GIMP_VER)
INCLUDES = -I..
DEFINES = -DGIMPDIR=\"$(GIMPDIR)\"
DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK2_CFLAGS)
DEPLIBS = $(GLIB_LIBS) $(INTL_LIBS)
# CFLAGS = $(GLIB_CFLAGS)
@ -128,7 +128,7 @@ gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
gimp-$(GIMP_VER).lib ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
$(GTK_LIBS) $(INTL_LIBS) $(DEPLIBS) $(LDFLAGS) /def:gimpui.def
$(GTK2_LIBS) $(INTL_LIBS) $(DEPLIBS) $(LDFLAGS) /def:gimpui.def
# gimpwidgets only for gimp_dialog_new

4
libgimpwidgets/makefile.msc
View File

@ -20,8 +20,8 @@ GIMPDIR = _gimp$(GIMP_VER)
INCLUDES = -I..
# DEFINES = -DG_LOG_DOMAIN=\"LibGimpWidgets\"
DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS)
DEPLIBS = $(GLIB_LIBS) $(GTK_LIBS) $(INTL_LIBS)
DEPCFLAGS = $(GLIB_CFLAGS) $(GTK2_CFLAGS) $(INTL_CFLAGS)
DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS)
all : \
..\config.h \

62
modules/makefile.msc
View File

@ -1,5 +1,3 @@
## WARNING: Outdated.
## Makefile for building gimp modules with Microsoft C
## Use: nmake -f makefile.msc
@ -8,36 +6,20 @@
# will pick it up.
GIMP = \install\gimp
TOP = ..\..
################################################################
# Nothing much configurable below
!IFNDEF DEBUG
# Full optimization:
OPTIMIZE = -Ox -MD
LINKDEBUG = /subsystem:windows
!ELSE
# Debugging:
OPTIMIZE = -Zi -MDd
LINKDEBUG = /subsystem:console /debug
!ENDIF
!INCLUDE $(TOP)\build\win32\make.msc
# cl -? describes the options
CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
GIMP_VER = 1.3
LDFLAGS = /link $(LINKDEBUG)
INSTALL = copy
GIMP_VER = 1.2
GTK_VER = 1.3
GLIB_VER = 1.3
GLIB = ..\..\glib
GMODULE = $(GLIB)\gmodule
GTK = ..\..\gtk+
INTL = ..\..\intl
CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk -I$(GTK) -I$(INTL)
INCLUDES = -I..
DEFINES = -DHAVE_CONFIG_H -DMODULE_COMPILATION
DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
DEPLIBS = $(INTL_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
BIN = $(GIMP)\modules
@ -59,25 +41,37 @@ install : all
copy ..\config.h.win32 ..\config.h
colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_gtk.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_gtk.obj $(LDFLAGS) \
..\app\gimp.lib \
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
$(DEPLIBS) /def:module.def
colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) \
..\app\gimp.lib \
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
$(DEPLIBS) /def:module.def
colorsel_water-$(GIMP_VER).dll : colorsel_water.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) \
..\app\gimp.lib \
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(DEPLIBS) /def:module.def
# cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj module.def
# $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) ..\app\gimp.lib \
$(DEPLIBS) /def:module.def
# cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj module.def
# $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) ..\app\gimp.lib \
$(DEPLIBS) /def:module.def
# General rule for building
.c.obj:
$(CC) $(CFLAGS) -GD -c $<
clean:
clean::
del *.dll
del *.lib
del *.obj

6
plug-ins/common/animationplay.c
View File

@ -116,13 +116,13 @@
#include <gtk/gtk.h>
#if defined (GDK_WINDOWING_X11)
#include <gdk/gdkx.h>
#include <gdk/x11/gdkx.h>
#elif defined (GDK_WINDOWING_WIN32)
#include <gdk/gdkwin32.h>
#include <gdk/win32/gdkwin32.h>
#elif defined (GDK_WINDOWING_DIRECTFB)
#include <gdk/gdkdirectfb.h>
#elif defined (GDK_WINDOWING_FB)
#include <gdk/gdkfb.h>
#include <gdk/linux-fb/gdkfb.h>
#endif
#include <libgimp/gimp.h>

3
plug-ins/common/gif.c
View File

@ -275,6 +275,9 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
/* uncomment the line below for a little debugging info */
/* #define GIFDEBUG yesplease */

3
plug-ins/common/jpeg.c
View File

@ -143,6 +143,9 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#define SCALE_WIDTH 125

1
plug-ins/common/nlfilt.c
View File

@ -581,7 +581,6 @@ mw_preview_new (GtkWidget *parent,
gtk_preview_set_color_cube (color_cube[0], color_cube[1],
color_cube[2], color_cube[3]);
gtk_widget_set_default_visual (gtk_preview_get_visual ());
gtk_widget_set_default_colormap (gtk_preview_get_cmap ());
frame = gtk_frame_new (_("Preview"));

40
plug-ins/common/plugin-browser.c
View File

@ -214,8 +214,6 @@ details_callback (GtkWidget *widget,
if (pdesc->details_showing == FALSE)
{
GTK_PANED (pdesc->paned)->child1_resize = FALSE;
gtk_paned_set_handle_size (GTK_PANED (pdesc->paned), 10);
gtk_paned_set_gutter_size (GTK_PANED (pdesc->paned), 6);
gtk_label_set_text (lab, _("Details <<"));
gtk_widget_show (pdesc->descr_scroll);
pdesc->details_showing = TRUE;
@ -225,8 +223,7 @@ details_callback (GtkWidget *widget,
GtkWidget *p = GTK_WIDGET (pdesc->paned)->parent;
GTK_PANED (pdesc->paned)->child1_resize = TRUE;
GTK_PANED (pdesc->paned)->child2_resize = TRUE;
gtk_paned_set_handle_size (GTK_PANED (pdesc->paned), 0);
gtk_paned_set_gutter_size (GTK_PANED (pdesc->paned), 0);
gtk_label_set_text (lab, _("Details >>"));
gtk_widget_hide (pdesc->descr_scroll);
gtk_paned_set_position (GTK_PANED (pdesc->paned),
@ -269,8 +266,8 @@ procedure_general_select_callback (PDesc *pdesc,
GimpParamDef *selected_return_vals;
GtkWidget *label;
GtkWidget *help;
GtkWidget *text;
GtkWidget *vscrollbar;
GtkWidget *text_view;
GtkTextBuffer *text_buffer;
GtkWidget *old_table;
GtkWidget *old_align;
gint table_row = 0;
@ -411,30 +408,26 @@ procedure_general_select_callback (PDesc *pdesc,
gtk_widget_show (help);
table_row++;
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), FALSE);
gtk_text_set_word_wrap(GTK_TEXT(text), TRUE);
gtk_widget_set_usize (text, -1, 60);
gtk_table_attach (GTK_TABLE (help), text, 0, 1, 0, 1,
text_buffer = gtk_text_buffer_new (NULL);
gtk_text_buffer_set_text (text_buffer, selected_proc_help, -1);
text_view = gtk_text_view_new_with_buffer (text_buffer);
g_object_unref (G_OBJECT (text_buffer));
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
gtk_widget_set_usize (text_view, -1, 60);
gtk_table_attach (GTK_TABLE (help), text_view, 0, 1, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (text);
gtk_widget_show (text_view);
vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
gtk_table_attach (GTK_TABLE (help), vscrollbar, 1, 2, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (vscrollbar);
label = gtk_hseparator_new (); /* ok, not really a label ... :) */
gtk_table_attach (GTK_TABLE (pdesc->info_table), label,
0, 4, table_row, table_row+1, GTK_FILL, GTK_FILL, 3, 6);
gtk_widget_show(label);
gtk_text_freeze (GTK_TEXT (text));
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL,
selected_proc_help, -1);
gtk_text_thaw (GTK_TEXT (text));
table_row++;
}
@ -1024,9 +1017,6 @@ gimp_plugin_desc (void)
hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
gtk_paned_set_handle_size (GTK_PANED (hbox), 0);
gtk_paned_set_gutter_size (GTK_PANED (hbox), 0);
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);

40
plug-ins/common/plugindetails.c
View File

@ -214,8 +214,6 @@ details_callback (GtkWidget *widget,
if (pdesc->details_showing == FALSE)
{
GTK_PANED (pdesc->paned)->child1_resize = FALSE;
gtk_paned_set_handle_size (GTK_PANED (pdesc->paned), 10);
gtk_paned_set_gutter_size (GTK_PANED (pdesc->paned), 6);
gtk_label_set_text (lab, _("Details <<"));
gtk_widget_show (pdesc->descr_scroll);
pdesc->details_showing = TRUE;
@ -225,8 +223,7 @@ details_callback (GtkWidget *widget,
GtkWidget *p = GTK_WIDGET (pdesc->paned)->parent;
GTK_PANED (pdesc->paned)->child1_resize = TRUE;
GTK_PANED (pdesc->paned)->child2_resize = TRUE;
gtk_paned_set_handle_size (GTK_PANED (pdesc->paned), 0);
gtk_paned_set_gutter_size (GTK_PANED (pdesc->paned), 0);
gtk_label_set_text (lab, _("Details >>"));
gtk_widget_hide (pdesc->descr_scroll);
gtk_paned_set_position (GTK_PANED (pdesc->paned),
@ -269,8 +266,8 @@ procedure_general_select_callback (PDesc *pdesc,
GimpParamDef *selected_return_vals;
GtkWidget *label;
GtkWidget *help;
GtkWidget *text;
GtkWidget *vscrollbar;
GtkWidget *text_view;
GtkTextBuffer *text_buffer;
GtkWidget *old_table;
GtkWidget *old_align;
gint table_row = 0;
@ -411,30 +408,26 @@ procedure_general_select_callback (PDesc *pdesc,
gtk_widget_show (help);
table_row++;
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), FALSE);
gtk_text_set_word_wrap(GTK_TEXT(text), TRUE);
gtk_widget_set_usize (text, -1, 60);
gtk_table_attach (GTK_TABLE (help), text, 0, 1, 0, 1,
text_buffer = gtk_text_buffer_new (NULL);
gtk_text_buffer_set_text (text_buffer, selected_proc_help, -1);
text_view = gtk_text_view_new_with_buffer (text_buffer);
g_object_unref (G_OBJECT (text_buffer));
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
gtk_widget_set_usize (text_view, -1, 60);
gtk_table_attach (GTK_TABLE (help), text_view, 0, 1, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (text);
gtk_widget_show (text_view);
vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
gtk_table_attach (GTK_TABLE (help), vscrollbar, 1, 2, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (vscrollbar);
label = gtk_hseparator_new (); /* ok, not really a label ... :) */
gtk_table_attach (GTK_TABLE (pdesc->info_table), label,
0, 4, table_row, table_row+1, GTK_FILL, GTK_FILL, 3, 6);
gtk_widget_show(label);
gtk_text_freeze (GTK_TEXT (text));
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL,
selected_proc_help, -1);
gtk_text_thaw (GTK_TEXT (text));
table_row++;
}
@ -1024,9 +1017,6 @@ gimp_plugin_desc (void)
hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
gtk_paned_set_handle_size (GTK_PANED (hbox), 0);
gtk_paned_set_gutter_size (GTK_PANED (hbox), 0);
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);

4
plug-ins/common/spheredesigner.c
View File

@ -2086,7 +2086,7 @@ void selectcolor1(vector *col)
window = gtk_color_selection_dialog_new( _("Color Selection Dialog"));
gtk_color_selection_set_opacity (GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG (window)->colorsel), TRUE);
gtk_color_selection_set_current_alpha (GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG (window)->colorsel), TRUE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed),
@ -2124,7 +2124,7 @@ void selectcolor2(vector *col)
window = gtk_color_selection_dialog_new( _("Color Selection Dialog"));
gtk_color_selection_set_opacity (GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG (window)->colorsel), TRUE);
gtk_color_selection_set_current_alpha (GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG (window)->colorsel), TRUE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed),

4
plug-ins/dbbrowser/dbbrowser_utils.c
View File

@ -35,6 +35,10 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
/* configuration */
#define DBL_LIST_WIDTH 220

4
plug-ins/dbbrowser/gimpprocbrowser.c
View File

@ -35,6 +35,10 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
/* configuration */
#define DBL_LIST_WIDTH 220

4
plug-ins/dbbrowser/gimpprocview.c
View File

@ -35,6 +35,10 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
/* configuration */
#define DBL_LIST_WIDTH 220

40
plug-ins/dbbrowser/plugin-browser.c
View File

@ -214,8 +214,6 @@ details_callback (GtkWidget *widget,
if (pdesc->details_showing == FALSE)
{
GTK_PANED (pdesc->paned)->child1_resize = FALSE;
gtk_paned_set_handle_size (GTK_PANED (pdesc->paned), 10);
gtk_paned_set_gutter_size (GTK_PANED (pdesc->paned), 6);
gtk_label_set_text (lab, _("Details <<"));
gtk_widget_show (pdesc->descr_scroll);
pdesc->details_showing = TRUE;
@ -225,8 +223,7 @@ details_callback (GtkWidget *widget,
GtkWidget *p = GTK_WIDGET (pdesc->paned)->parent;
GTK_PANED (pdesc->paned)->child1_resize = TRUE;
GTK_PANED (pdesc->paned)->child2_resize = TRUE;
gtk_paned_set_handle_size (GTK_PANED (pdesc->paned), 0);
gtk_paned_set_gutter_size (GTK_PANED (pdesc->paned), 0);
gtk_label_set_text (lab, _("Details >>"));
gtk_widget_hide (pdesc->descr_scroll);
gtk_paned_set_position (GTK_PANED (pdesc->paned),
@ -269,8 +266,8 @@ procedure_general_select_callback (PDesc *pdesc,
GimpParamDef *selected_return_vals;
GtkWidget *label;
GtkWidget *help;
GtkWidget *text;
GtkWidget *vscrollbar;
GtkWidget *text_view;
GtkTextBuffer *text_buffer;
GtkWidget *old_table;
GtkWidget *old_align;
gint table_row = 0;
@ -411,30 +408,26 @@ procedure_general_select_callback (PDesc *pdesc,
gtk_widget_show (help);
table_row++;
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), FALSE);
gtk_text_set_word_wrap(GTK_TEXT(text), TRUE);
gtk_widget_set_usize (text, -1, 60);
gtk_table_attach (GTK_TABLE (help), text, 0, 1, 0, 1,
text_buffer = gtk_text_buffer_new (NULL);
gtk_text_buffer_set_text (text_buffer, selected_proc_help, -1);
text_view = gtk_text_view_new_with_buffer (text_buffer);
g_object_unref (G_OBJECT (text_buffer));
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
gtk_widget_set_usize (text_view, -1, 60);
gtk_table_attach (GTK_TABLE (help), text_view, 0, 1, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (text);
gtk_widget_show (text_view);
vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
gtk_table_attach (GTK_TABLE (help), vscrollbar, 1, 2, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (vscrollbar);
label = gtk_hseparator_new (); /* ok, not really a label ... :) */
gtk_table_attach (GTK_TABLE (pdesc->info_table), label,
0, 4, table_row, table_row+1, GTK_FILL, GTK_FILL, 3, 6);
gtk_widget_show(label);
gtk_text_freeze (GTK_TEXT (text));
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL,
selected_proc_help, -1);
gtk_text_thaw (GTK_TEXT (text));
table_row++;
}
@ -1024,9 +1017,6 @@ gimp_plugin_desc (void)
hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
gtk_paned_set_handle_size (GTK_PANED (hbox), 0);
gtk_paned_set_gutter_size (GTK_PANED (hbox), 0);
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);

4
plug-ins/gap/gap_dbbrowser_utils.c
View File

@ -45,6 +45,10 @@
#include "gap_filter.h"
#include "gap_dbbrowser_utils.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
extern int gap_debug;
int

1
plug-ins/gap/gap_mov_dialog.c
View File

@ -470,7 +470,6 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr,
gtk_preview_set_color_cube (color_cube[0], color_cube[1],
color_cube[2], color_cube[3]);
gtk_widget_set_default_visual (gtk_preview_get_visual ());
gtk_widget_set_default_colormap (gtk_preview_get_cmap ());
/* dialog */

37
plug-ins/gflare/gtkmultioptionmenu.c
View File

@ -46,8 +46,6 @@ static void gtk_multi_option_menu_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_multi_option_menu_paint (GtkWidget *widget,
GdkRectangle *area);
static void gtk_multi_option_menu_draw (GtkWidget *widget,
GdkRectangle *area);
static gint gtk_multi_option_menu_expose (GtkWidget *widget,
GdkEventExpose *event);
static gint gtk_multi_option_menu_button_press (GtkWidget *widget,
@ -109,8 +107,6 @@ gtk_multi_option_menu_class_init (GtkMultiOptionMenuClass *class)
object_class->destroy = gtk_multi_option_menu_destroy;
widget_class->draw = gtk_multi_option_menu_draw;
widget_class->draw_focus = NULL;
widget_class->size_request = gtk_multi_option_menu_size_request;
widget_class->size_allocate = gtk_multi_option_menu_size_allocate;
widget_class->expose_event = gtk_multi_option_menu_expose;
@ -259,13 +255,13 @@ gtk_multi_option_menu_size_request (GtkWidget *widget,
multi_option_menu = GTK_MULTI_OPTION_MENU (widget);
requisition->width = ((GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->klass->xthickness) * 2 +
GTK_WIDGET (widget)->style->xthickness) * 2 +
multi_option_menu->width +
MULTI_OPTION_INDICATOR_WIDTH +
MULTI_OPTION_INDICATOR_SPACING * 5 +
CHILD_LEFT_SPACING + CHILD_RIGHT_SPACING);
requisition->height = ((GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->klass->ythickness) * 2 +
GTK_WIDGET (widget)->style->ythickness) * 2 +
multi_option_menu->height +
CHILD_TOP_SPACING + CHILD_BOTTOM_SPACING);
@ -301,13 +297,13 @@ gtk_multi_option_menu_size_allocate (GtkWidget *widget,
multi_option_menu = GTK_MULTI_OPTION_MENU (widget);
allocation->width = ((GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->klass->xthickness) * 2 +
GTK_WIDGET (widget)->style->xthickness) * 2 +
multi_option_menu->width +
MULTI_OPTION_INDICATOR_WIDTH +
MULTI_OPTION_INDICATOR_SPACING * 5 +
CHILD_LEFT_SPACING + CHILD_RIGHT_SPACING);
allocation->height = ((GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->klass->ythickness) * 2 +
GTK_WIDGET (widget)->style->ythickness) * 2 +
multi_option_menu->height +
CHILD_TOP_SPACING + CHILD_BOTTOM_SPACING);
@ -318,9 +314,9 @@ gtk_multi_option_menu_size_allocate (GtkWidget *widget,
}
child_allocation.x = (GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->klass->xthickness);
GTK_WIDGET (widget)->style->xthickness);
child_allocation.y = (GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->klass->ythickness);
GTK_WIDGET (widget)->style->ythickness);
child_allocation.width = (allocation->width - child_allocation.x * 2 -
MULTI_OPTION_INDICATOR_WIDTH - MULTI_OPTION_INDICATOR_SPACING * 5 -
CHILD_LEFT_SPACING - CHILD_RIGHT_SPACING);
@ -373,27 +369,6 @@ gtk_multi_option_menu_paint (GtkWidget *widget,
}
}
static void
gtk_multi_option_menu_draw (GtkWidget *widget,
GdkRectangle *area)
{
GtkWidget *child;
GdkRectangle child_area;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MULTI_OPTION_MENU (widget));
g_return_if_fail (area != NULL);
if (GTK_WIDGET_DRAWABLE (widget))
{
gtk_multi_option_menu_paint (widget, area);
child = GTK_BUTTON (widget)->child;
if (child && gtk_widget_intersect (child, area, &child_area))
gtk_widget_draw (child, &child_area);
}
}
static gint
gtk_multi_option_menu_expose (GtkWidget *widget,
GdkEventExpose *event)

1
plug-ins/gimpressionist/gimpressionist.c
View File

@ -408,7 +408,6 @@ int create_dialog(void)
gtk_init(&argc, &argv);
gtk_rc_parse (gimp_gtkrc ());
gtk_widget_set_default_visual (gdk_rgb_get_visual());
gtk_widget_set_default_colormap (gdk_rgb_get_cmap());
}
else

4
plug-ins/gimpressionist/presets.c
View File

@ -16,6 +16,10 @@
#include "ppmtool.h"
#include <libgimp/stdplugins-intl.h>
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
GtkWidget *presetnameentry = NULL;
GtkWidget *presetsavebutton = NULL;
GtkWidget *presetlist = NULL;

4
plug-ins/imagemap/imap_preview.c
View File

@ -455,7 +455,7 @@ make_preview(GimpDrawable *drawable)
data->hruler = ruler = gtk_hruler_new();
gtk_ruler_set_range(GTK_RULER(ruler), 0, data->width, 0, PREVIEW_SIZE);
gtk_signal_connect_object(GTK_OBJECT(preview), "motion_notify_event",
(GtkSignalFunc) GTK_WIDGET_CLASS(GTK_OBJECT(ruler)->klass)->motion_notify_event,
(GtkSignalFunc) GTK_WIDGET_GET_CLASS(ruler)->motion_notify_event,
GTK_OBJECT(ruler));
gtk_table_attach(GTK_TABLE(table), ruler, 1, 2, 0, 1, GTK_FILL, GTK_FILL,
0, 0);
@ -465,7 +465,7 @@ make_preview(GimpDrawable *drawable)
data->vruler = ruler = gtk_vruler_new();
gtk_ruler_set_range(GTK_RULER(ruler), 0, data->height, 0, PREVIEW_SIZE);
gtk_signal_connect_object(GTK_OBJECT(preview), "motion_notify_event",
(GtkSignalFunc) GTK_WIDGET_CLASS (GTK_OBJECT (ruler)->klass)->motion_notify_event,
(GtkSignalFunc) GTK_WIDGET_GET_CLASS (ruler)->motion_notify_event,
GTK_OBJECT(ruler));
gtk_table_attach(GTK_TABLE(table), ruler, 0, 1, 1, 2, GTK_FILL, GTK_FILL,
0, 0);

5
plug-ins/imagemap/imap_selection.c
View File

@ -155,9 +155,12 @@ make_selection_toolbar(Selection_t *data, GtkWidget *window)
{
GtkWidget *toolbar;
toolbar = gtk_toolbar_new(GTK_ORIENTATION_VERTICAL, GTK_TOOLBAR_ICONS);
toolbar = gtk_toolbar_new();
gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width(GTK_CONTAINER(toolbar), 5);
/* FIXME: replacement ?
gtk_toolbar_set_space_size(GTK_TOOLBAR(toolbar), 5);
*/
data->arrow_up = make_toolbar_icon(toolbar, window, arrow_up_xpm, "MoveUp",
_("Move Up"), selection_command,

3
plug-ins/imagemap/imap_settings.c
View File

@ -29,6 +29,9 @@
#include "imap_string.h"
#include "imap_table.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
static MapFormat_t _map_format = CSIM;

4
plug-ins/imagemap/imap_source.c
View File

@ -29,6 +29,10 @@
#include "imap_main.h"
#include "imap_source.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
static void
save_to_view(gpointer param, const char* format, ...)
{

6
plug-ins/imagemap/imap_toolbar.c
View File

@ -99,11 +99,13 @@ make_toolbar(GtkWidget *main_vbox, GtkWidget *window)
handlebox = gtk_handle_box_new();
gtk_box_pack_start(GTK_BOX(main_vbox), handlebox, FALSE, FALSE, 0);
data->toolbar = toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
GTK_TOOLBAR_ICONS);
data->toolbar = toolbar = gtk_toolbar_new();
gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
gtk_container_set_border_width(GTK_CONTAINER(toolbar), 5);
/* FIXME: replacement
gtk_toolbar_set_space_size(GTK_TOOLBAR(toolbar), 8);
*/
gtk_container_add(GTK_CONTAINER(handlebox), toolbar);
make_toolbar_icon(toolbar, window, open_xpm, "Open",

4
plug-ins/imagemap/imap_tools.c
View File

@ -119,9 +119,11 @@ make_tools(GtkWidget *window)
GtkWidget *toolbar;
_tools.container = handlebox = gtk_handle_box_new();
toolbar = gtk_toolbar_new(GTK_ORIENTATION_VERTICAL, GTK_TOOLBAR_ICONS);
gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width(GTK_CONTAINER(toolbar), 5);
/* FIXME: replacement
gtk_toolbar_set_space_size(GTK_TOOLBAR(toolbar), 5);
*/
gtk_container_add(GTK_CONTAINER(handlebox), toolbar);
_tools.arrow = make_toolbar_radio_icon(toolbar, window, NULL, arrow_xpm,

3
plug-ins/jpeg/jpeg-load.c
View File

@ -143,6 +143,9 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#define SCALE_WIDTH 125

3
plug-ins/jpeg/jpeg-load.h
View File

@ -143,6 +143,9 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#define SCALE_WIDTH 125

3
plug-ins/jpeg/jpeg-save.c
View File

@ -143,6 +143,9 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#define SCALE_WIDTH 125

3
plug-ins/jpeg/jpeg-save.h
View File

@ -143,6 +143,9 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#define SCALE_WIDTH 125

3
plug-ins/jpeg/jpeg.c
View File

@ -143,6 +143,9 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#define SCALE_WIDTH 125

3
plug-ins/jpeg/jpeg.h
View File

@ -143,6 +143,9 @@
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#define SCALE_WIDTH 125

6
plug-ins/makefile.msc
View File

@ -585,7 +585,7 @@ RTL = -MDd
CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(INTL)
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GLIB_CFLAGS) $(GTK2_CFLAGS) -I$(INTL)
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
@ -618,7 +618,7 @@ $(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\..\libgimpmath\gimpmath-$(GIMP_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) $(EXTRALIBS) $(LDFLAGS)
$(GTK2_LIBS) $(INTL_LIBS) $(GLIB_LIBS) $(EXTRALIBS) $(LDFLAGS)
$(PLUGIN).res : $(PLUGIN).rc
rc -r -fo $(PLUGIN).res $(PLUGIN).rc
@ -662,7 +662,7 @@ OBJECTS = $(MODULE).obj
$(MODULE).$(MODULE_EXT) : $(OBJECTS) $(MODULE).def
$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LDFLAGS) $(EXTRALIBS) \
..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib \
$(GTK_LIBS) $(GLIB_LIBS) /def:$(MODULE).def
$(GTK2_LIBS) $(GLIB_LIBS) /def:$(MODULE).def
!ENDIF
.c.obj :

4
plug-ins/script-fu/script-fu-console.c
View File

@ -43,6 +43,10 @@
#include <plug-ins/dbbrowser/dbbrowser_utils.h>
/* FIXME: To get the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#ifdef G_OS_WIN32
#include <fcntl.h>
#include <io.h>

4
plug-ins/script-fu/script-fu-interface.c
View File

@ -35,6 +35,10 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
/* FIXME: To get the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#include "siod.h"
#include "script-fu-scripts.h"

4
plug-ins/script-fu/script-fu-scripts.c
View File

@ -35,6 +35,10 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
/* FIXME: To get the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#include "siod.h"
#include "script-fu-scripts.h"