Commit 95a8c724 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

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
parent 652d670a
......@@ -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 : \
......
......@@ -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 : \
......
......@@ -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 = \
......
......@@ -24,7 +24,7 @@ PKG_LINK = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir)
all : \
......
......@@ -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 : \
......
......@@ -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 : \
......
# 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) $<
......@@ -12,7 +12,7 @@ LT_RELEASE = $(PKG_VER)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir) \
OBJECTS = \
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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 \
......
## 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
# cl -? describes the options
CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
LDFLAGS = /link $(LINKDEBUG)
INSTALL = copy
GIMP_VER = 1.2
GTK_VER = 1.3
GLIB_VER = 1.3
!INCLUDE $(TOP)\build\win32\make.msc
GLIB = ..\..\glib
GMODULE = $(GLIB)\gmodule
GTK = ..\..\gtk+
INTL = ..\..\intl
GIMP_VER = 1.3
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
......
......@@ -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>
......
......@@ -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 */
......
......@@ -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
......
......@@ -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"));
......
......@@ -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);
......
......@@ -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);
......
......@@ -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),
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......
......@@ -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 */
......
......@@ -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);