mirror of https://github.com/GNOME/gimp.git
need to link with pangof2
2001-09-22 Hans Breuer <hans@breuer.org> * app/makefile.msc : need to link with pangof2 * app/display/display-funcs.h : new file to provide prototype gdisplays_selection_visibility () * app/core/gimpimage-mask.c : * app/core/gimplayer.c : use it * app/core/makefile.msc : generate gimpmarshal.[hc] * app/gui/makefile.msc : add error-console-dialog.obj, also more trying for building as dll * app/tools/gimpinktool.c(965) : avoid "fatal error C1021: invalid preprocessor command 'warning'", by wrapping it in #ifdef __GNUC__ * app/tools/makefile.msc : add FREETYPE2_CFLAGS * app/widgets/gimpfontselction-dialog.c : use g_strcasecmp () * app/tools/makefile.msc : add FREETYPE2_CFLAGS and gimpfontselction* * libgimp/gimp.def : * libgimpwidgets/gimpwidgets.def : updated externals * libgimpwidgets/makefile.msc : add gimpstock * plug-ins/makefile.msc : gflare doesn't require EXTRA_gflare anymore * plug-ins/common/spheredesigner.c : * plug-ins/helpbrowser/helpbrowser.c : * plug-ins/imagemap/imap_main.c : remove _help_accel from gimp_help_connect () * plug-ins/gap/gap_mov_dialog.c : * plug-ins/gap/gap_navigator_dialog.c : remove references to use_xshm and gimp_color_cube () * plug-ins/gfig/gfig.c : don't access ->klass, but use G_OBJECT_GET_CLASS * plug-ins/gimpressionist/repaint.c : the GtkButton::child field is moved to the parent GtkBin. * plug-ins/ifscompose/ifscompose.c : the GtkStyle::font field isn't public anymore, use accessor gtk_style_get_font () * plug-ins/imagemap/imap_preferences.c : reflect GTK2 API change gtk_notebook_set_current_page ()
This commit is contained in:
Hans Breuer
Hans Breuer
parent
cb474a0845
commit
c2f9c198ea
51
ChangeLog
51
ChangeLog
|
|
@ -1,3 +1,54 @@
|
|||
2001-09-22 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* app/makefile.msc : need to link with pangof2
|
||||
|
||||
* app/display/display-funcs.h : new file to provide prototype
|
||||
gdisplays_selection_visibility ()
|
||||
* app/core/gimpimage-mask.c :
|
||||
* app/core/gimplayer.c : use it
|
||||
|
||||
* app/core/makefile.msc : generate gimpmarshal.[hc]
|
||||
|
||||
* app/gui/makefile.msc : add error-console-dialog.obj, also
|
||||
more trying for building as dll
|
||||
|
||||
* app/tools/gimpinktool.c(965) : avoid "fatal error C1021: invalid
|
||||
preprocessor command 'warning'", by wrapping it in #ifdef __GNUC__
|
||||
|
||||
* app/tools/makefile.msc : add FREETYPE2_CFLAGS
|
||||
|
||||
* app/widgets/gimpfontselction-dialog.c : use g_strcasecmp ()
|
||||
|
||||
* app/tools/makefile.msc : add FREETYPE2_CFLAGS and gimpfontselction*
|
||||
|
||||
* libgimp/gimp.def :
|
||||
* libgimpwidgets/gimpwidgets.def : updated externals
|
||||
|
||||
* libgimpwidgets/makefile.msc : add gimpstock
|
||||
|
||||
* plug-ins/makefile.msc : gflare doesn't require EXTRA_gflare anymore
|
||||
|
||||
* plug-ins/common/spheredesigner.c :
|
||||
* plug-ins/helpbrowser/helpbrowser.c :
|
||||
* plug-ins/imagemap/imap_main.c :
|
||||
remove _help_accel from gimp_help_connect ()
|
||||
|
||||
* plug-ins/gap/gap_mov_dialog.c :
|
||||
* plug-ins/gap/gap_navigator_dialog.c : remove references to
|
||||
use_xshm and gimp_color_cube ()
|
||||
|
||||
* plug-ins/gfig/gfig.c : don't access ->klass, but use
|
||||
G_OBJECT_GET_CLASS
|
||||
|
||||
* plug-ins/gimpressionist/repaint.c : the GtkButton::child
|
||||
field is moved to the parent GtkBin.
|
||||
|
||||
* plug-ins/ifscompose/ifscompose.c : the GtkStyle::font field
|
||||
isn't public anymore, use accessor gtk_style_get_font ()
|
||||
|
||||
* plug-ins/imagemap/imap_preferences.c : reflect GTK2 API change
|
||||
gtk_notebook_set_current_page ()
|
||||
|
||||
2001-09-20 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* libgimpwidgets/gimpdialog.[ch]: made a real object (GtkDialog
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
|
||||
#include "libgimp/gimpintl.h"
|
||||
|
||||
#include "display/display-funcs.h"
|
||||
|
||||
/* local variables */
|
||||
static gboolean gimage_mask_stroking = FALSE;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
|
||||
#include "libgimp/gimpintl.h"
|
||||
|
||||
#include "display/display-funcs.h"
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ PKG_LINK = \
|
|||
..\base\appbase-$(PKG_VER).lib \
|
||||
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
|
||||
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
|
||||
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib
|
||||
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
|
||||
..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib
|
||||
|
||||
OBJECTS = \
|
||||
gimp.obj \
|
||||
|
|
@ -31,6 +32,7 @@ OBJECTS = \
|
|||
gimpdatafactory.obj \
|
||||
gimpdatafiles.obj \
|
||||
gimpdatalist.obj \
|
||||
gimpdocuments.obj \
|
||||
gimpdrawable.obj \
|
||||
gimpdrawable-desaturate.obj \
|
||||
gimpdrawable-equalize.obj \
|
||||
|
|
@ -48,6 +50,7 @@ OBJECTS = \
|
|||
gimpimage-mask.obj \
|
||||
gimpimage-new.obj \
|
||||
gimpimage-undo.obj \
|
||||
gimpimagefile.obj \
|
||||
gimplayer.obj \
|
||||
gimplayermask.obj \
|
||||
gimplist.obj \
|
||||
|
|
@ -66,7 +69,6 @@ OBJECTS = \
|
|||
gimpunit.obj \
|
||||
gimpviewable.obj \
|
||||
|
||||
|
||||
OTHER_FILES = \
|
||||
\
|
||||
..\floating_sel.obj \
|
||||
|
|
@ -87,9 +89,24 @@ INCLUDES = \
|
|||
|
||||
all : \
|
||||
$(PRJ_TOP)\config.h \
|
||||
gimpmarshal.h \
|
||||
gimpmarshal.c \
|
||||
$(PACKAGE).lib \
|
||||
$(PACKAGE)-$(PKG_VER).dll
|
||||
|
||||
gimpmarshal.h : gimpmarshal.list
|
||||
echo #ifndef __GIMP_MARSHAL_H__ > xgen-gmh
|
||||
echo #define __GIMP_MARSHAL_H__ >> xgen-gmh
|
||||
$(GLIB)\gobject\glib-genmarshal --nostdinc --prefix=gimp_cclosure_marshal gimpmarshal.list --header >> xgen-gmh
|
||||
echo #endif /* __GIMP_MARSHAL_H__ */ >> xgen-gmh
|
||||
copy xgen-gmh gimpmarshal.h
|
||||
|
||||
gimpmarshal.c : gimpmarshal.h gimpmarshal.list
|
||||
echo #include "glib.h" > xgen-gmc
|
||||
echo #include "glib-object.h" >> xgen-gmc
|
||||
echo #include "gimpmarshal.h" >> xgen-gmc
|
||||
$(GLIB)\gobject\glib-genmarshal --nostdinc --prefix=gimp_cclosure_marshal gimpmarshal.list --body >> xgen-gmc
|
||||
copy xgen-gmc gimpmarshal.c
|
||||
|
||||
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
|
||||
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
|
||||
|
|
@ -108,3 +125,7 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
|
|||
|
||||
.c.obj :
|
||||
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
|
||||
|
||||
clean ::
|
||||
del gimpmarshal.c
|
||||
del gimpmarshal.h
|
||||
|
|
@ -15,6 +15,7 @@ PKG_LINK = \
|
|||
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
|
||||
..\base\appbase-$(PKG_VER).lib \
|
||||
..\core\appcore-$(PKG_VER).lib \
|
||||
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
|
||||
..\widgets\appwidgets-$(PKG_VER).lib \
|
||||
|
||||
OBJECTS = \
|
||||
|
|
@ -34,6 +35,7 @@ OBJECTS = \
|
|||
dialogs-commands.obj \
|
||||
dialogs-constructors.obj \
|
||||
edit-commands.obj \
|
||||
error-console-dialog.obj \
|
||||
file-commands.obj \
|
||||
file-dialog-utils.obj \
|
||||
file-new-dialog.obj \
|
||||
|
|
@ -91,6 +93,9 @@ RESOURCE = $(PACKAGE).res
|
|||
$(PACKAGE).lib : $(OBJECTS)
|
||||
lib /out:$(PACKAGE).lib $(OBJECTS)
|
||||
|
||||
$(PACKAGE)-$(PKG_VER).exp : $(OBJECTS) $(PACKAGE).def
|
||||
lib /def:$(PACKAGE).DEF /out:$(PACKAGE)-$(PKG_VER).exp $(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
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,8 @@ PKG_LINK = \
|
|||
$(GTK2_LIBS) \
|
||||
$(GIMP_THREAD_LIBS) \
|
||||
$(GIMP_MP_LIBS) \
|
||||
$(INTLLIBS)\
|
||||
$(INTLLIBS) \
|
||||
$(PANGO)\pango\pangoft2-$(PANGO_VER).lib
|
||||
|
||||
gimp_LDFLAGS = \
|
||||
-export-dynamic -export-symbols $(srcdir)/gimp.sym
|
||||
|
|
@ -60,7 +61,6 @@ OBJECTS = \
|
|||
colormaps.obj \
|
||||
devices.obj \
|
||||
docindex.obj \
|
||||
errorconsole.obj \
|
||||
gimpprogress.obj \
|
||||
nav_window.obj \
|
||||
ops_buttons.obj \
|
||||
|
|
|
|||
|
|
@ -961,9 +961,9 @@ ink_button_press (GimpTool *tool,
|
|||
|
||||
tool->gdisp = gdisp;
|
||||
tool->state = ACTIVE;
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning FIXME: presure, tilt
|
||||
|
||||
#endif
|
||||
b = ink_pen_ellipse (x, y,
|
||||
1.0, 0.5, 0.5,
|
||||
/* bevent->pressure, bevent->xtilt, bevent->ytilt, */
|
||||
|
|
@ -1148,13 +1148,15 @@ ink_motion (GimpTool *tool,
|
|||
ink_tool->lastx = x;
|
||||
ink_tool->lasty = y;
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning FIXME: tilt, pressure
|
||||
|
||||
#endif
|
||||
pressure = 1.0; /* mevent->pressure; */
|
||||
velocity = 10.0 * sqrt ((dist) / (double) (thistime - lasttime));
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning FIXME: tilt, pressure
|
||||
|
||||
#endif
|
||||
b = ink_pen_ellipse (x, y, pressure, 0.5, 0.5,
|
||||
/* mevent->xtilt, mevent->ytilt, */ velocity);
|
||||
blob_union = blob_convex_union (ink_tool->last_blob, b);
|
||||
|
|
|
|||
|
|
@ -961,9 +961,9 @@ ink_button_press (GimpTool *tool,
|
|||
|
||||
tool->gdisp = gdisp;
|
||||
tool->state = ACTIVE;
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning FIXME: presure, tilt
|
||||
|
||||
#endif
|
||||
b = ink_pen_ellipse (x, y,
|
||||
1.0, 0.5, 0.5,
|
||||
/* bevent->pressure, bevent->xtilt, bevent->ytilt, */
|
||||
|
|
@ -1148,13 +1148,15 @@ ink_motion (GimpTool *tool,
|
|||
ink_tool->lastx = x;
|
||||
ink_tool->lasty = y;
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning FIXME: tilt, pressure
|
||||
|
||||
#endif
|
||||
pressure = 1.0; /* mevent->pressure; */
|
||||
velocity = 10.0 * sqrt ((dist) / (double) (thistime - lasttime));
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning FIXME: tilt, pressure
|
||||
|
||||
#endif
|
||||
b = ink_pen_ellipse (x, y, pressure, 0.5, 0.5,
|
||||
/* mevent->xtilt, mevent->ytilt, */ velocity);
|
||||
blob_union = blob_convex_union (ink_tool->last_blob, b);
|
||||
|
|
|
|||
|
|
@ -81,9 +81,9 @@ OBJECTS = \
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/app \
|
||||
$(GTK2_CFLAGS) \
|
||||
$(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
|
||||
-I$(includedir)
|
||||
|
||||
|
||||
all : \
|
||||
$(PRJ_TOP)\config.h \
|
||||
$(PACKAGE).lib \
|
||||
|
|
|
|||
|
|
@ -279,8 +279,8 @@ gimp_font_selection_dialog_set_font_desc (GimpFontSelectionDialog *dialog,
|
|||
|
||||
for (i = 0; i < dialog->n_families; i++)
|
||||
{
|
||||
if (!strcasecmp (name,
|
||||
pango_font_family_get_name (dialog->families[i])))
|
||||
if (!g_strcasecmp (name,
|
||||
pango_font_family_get_name (dialog->families[i])))
|
||||
{
|
||||
row = i;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@ OBJECTS = \
|
|||
gimpdrawablelistitem.obj \
|
||||
gimpdrawablelistview.obj \
|
||||
gimpdrawablepreview.obj \
|
||||
gimpfontselection.obj \
|
||||
gimpfontselection-dialog.obj \
|
||||
gimpgradientpreview.obj \
|
||||
gimphistogramview.obj \
|
||||
gimpimagedock.obj \
|
||||
|
|
@ -67,7 +69,7 @@ OBJECTS = \
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/app \
|
||||
$(GTK2_CFLAGS) \
|
||||
$(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
|
||||
-I$(includedir)
|
||||
|
||||
all : \
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ EXPORTS
|
|||
gimp_channel_set_visible
|
||||
gimp_clone
|
||||
gimp_clone_default
|
||||
gimp_color_cube
|
||||
; gimp_color_cube
|
||||
gimp_color_picker
|
||||
gimp_convert_grayscale
|
||||
gimp_convert_indexed
|
||||
|
|
@ -119,6 +119,7 @@ EXPORTS
|
|||
gimp_free_select
|
||||
gimp_fuzzy_select
|
||||
gimp_gamma
|
||||
gimp_get_default_comment
|
||||
gimp_get_monitor_resolution
|
||||
gimp_get_path_by_tattoo
|
||||
gimp_get_progname
|
||||
|
|
@ -318,6 +319,5 @@ EXPORTS
|
|||
gimp_undo_push_group_start
|
||||
gimp_uninstall_temp_proc
|
||||
gimp_unit_get_factor
|
||||
gimp_use_xshm
|
||||
gimp_version
|
||||
set_gimp_PLUG_IN_INFO_PTR
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ EXPORTS
|
|||
gimp_coordinates_new
|
||||
gimp_dialog_create_action_area
|
||||
gimp_dialog_create_action_areav
|
||||
gimp_dialog_get_type
|
||||
gimp_dialog_new
|
||||
gimp_dialog_newv
|
||||
gimp_dialog_set_icon
|
||||
|
|
@ -37,7 +38,7 @@ EXPORTS
|
|||
gimp_file_selection_new
|
||||
gimp_file_selection_set_filename
|
||||
gimp_float_adjustment_update
|
||||
gimp_help_connect_help_accel
|
||||
gimp_help_connect
|
||||
gimp_help_disable_tooltips
|
||||
gimp_help_enable_tooltips
|
||||
gimp_help_free
|
||||
|
|
@ -89,6 +90,7 @@ EXPORTS
|
|||
gimp_size_entry_set_value
|
||||
gimp_size_entry_set_value_boundaries
|
||||
gimp_spin_button_new
|
||||
gimp_stock_init
|
||||
gimp_standard_help_func
|
||||
gimp_table_attach_aligned
|
||||
gimp_toggle_button_sensitive_update
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ GIMPDIR = _gimp$(GIMP_VER)
|
|||
INCLUDES = -I..
|
||||
# DEFINES = -DG_LOG_DOMAIN=\"LibGimpWidgets\"
|
||||
DEPCFLAGS = $(GLIB_CFLAGS) $(GTK2_CFLAGS) $(INTL_CFLAGS)
|
||||
DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS)
|
||||
DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
|
||||
$(GTK2)\gdk-pixbuf\gdk_pixbuf-$(GTK_VER).lib
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
|
|
@ -46,6 +47,7 @@ OBJECTS = \
|
|||
gimpcolorbutton.obj \
|
||||
gimphelpui.obj \
|
||||
gimpsizeentry.obj \
|
||||
gimpstock.obj \
|
||||
gimpunitmenu.obj \
|
||||
gimpoffsetarea.obj \
|
||||
libgimp-glue.obj
|
||||
|
|
|
|||
|
|
@ -1844,8 +1844,8 @@ void fileselect(int action)
|
|||
"clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy),
|
||||
GTK_OBJECT (windows[action]));
|
||||
|
||||
gimp_help_connect_help_accel (windows[action], gimp_standard_help_func,
|
||||
"filters/spheredesigner.html");
|
||||
gimp_help_connect (windows[action], gimp_standard_help_func,
|
||||
"filters/spheredesigner.html");
|
||||
}
|
||||
gtk_widget_show (windows[action]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -447,7 +447,6 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr,
|
|||
GtkWidget *src_sel_frame;
|
||||
GtkWidget *check_button;
|
||||
GtkObject *adj;
|
||||
guchar *color_cube;
|
||||
t_ok_data ok_data;
|
||||
|
||||
gchar **argv;
|
||||
|
|
@ -463,12 +462,8 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr,
|
|||
gtk_rc_parse (gimp_gtkrc ());
|
||||
|
||||
|
||||
gdk_set_use_xshm (gimp_use_xshm ());
|
||||
gtk_preview_set_gamma (gimp_gamma ());
|
||||
gtk_preview_set_install_cmap (gimp_install_cmap ());
|
||||
color_cube = gimp_color_cube ();
|
||||
gtk_preview_set_color_cube (color_cube[0], color_cube[1],
|
||||
color_cube[2], color_cube[3]);
|
||||
|
||||
gtk_widget_set_default_colormap (gtk_preview_get_cmap ());
|
||||
|
||||
|
|
|
|||
|
|
@ -3106,7 +3106,6 @@ int gap_navigator(gint32 image_id)
|
|||
GtkWidget *button;
|
||||
GtkWidget *subshell;
|
||||
gint argc = 1;
|
||||
guchar *color_cube;
|
||||
gchar **argv = g_new (gchar *, 1);
|
||||
argv[0] = g_strdup ("gap_navigator");
|
||||
|
||||
|
|
@ -3116,13 +3115,8 @@ int gap_navigator(gint32 image_id)
|
|||
gtk_init (&argc, &argv);
|
||||
gtk_rc_parse (gimp_gtkrc ());
|
||||
|
||||
gdk_set_use_xshm (gimp_use_xshm ());
|
||||
gtk_preview_set_gamma(gimp_gamma());
|
||||
gtk_preview_set_install_cmap(gimp_install_cmap());
|
||||
color_cube = gimp_color_cube();
|
||||
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());
|
||||
|
||||
/* The main shell */
|
||||
|
|
|
|||
|
|
@ -3813,7 +3813,7 @@ make_preview (void)
|
|||
ruler = gtk_hruler_new ();
|
||||
gtk_ruler_set_range (GTK_RULER (ruler), 0, preview_width, 0, PREVIEW_SIZE);
|
||||
gtk_signal_connect_object (GTK_OBJECT (gfig_preview), "motion_notify_event",
|
||||
(GtkSignalFunc) GTK_WIDGET_CLASS (GTK_OBJECT (ruler)->klass)->motion_notify_event,
|
||||
(GtkSignalFunc) GTK_WIDGET_CLASS (G_OBJECT_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);
|
||||
|
|
@ -3822,7 +3822,7 @@ make_preview (void)
|
|||
ruler = gtk_vruler_new ();
|
||||
gtk_ruler_set_range (GTK_RULER (ruler), 0, preview_height, 0, PREVIEW_SIZE);
|
||||
gtk_signal_connect_object (GTK_OBJECT (gfig_preview), "motion_notify_event",
|
||||
(GtkSignalFunc) GTK_WIDGET_CLASS (GTK_OBJECT (ruler)->klass)->motion_notify_event,
|
||||
(GtkSignalFunc) GTK_WIDGET_CLASS (G_OBJECT_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);
|
||||
|
|
|
|||
|
|
@ -615,11 +615,7 @@ void repaint(struct ppm *p, struct ppm *a)
|
|||
} else {
|
||||
char tmps[40];
|
||||
sprintf(tmps, "%.1f %%", 100 * (1.0 - ((double)i / max_progress)));
|
||||
#if GTK_MINOR_VERSION == 0
|
||||
gtk_label_set(GTK_LABEL(GTK_BUTTON(previewbutton)->child), tmps);
|
||||
#else
|
||||
gtk_label_set_text(GTK_LABEL(GTK_BUTTON(previewbutton)->child), tmps);
|
||||
#endif
|
||||
gtk_label_set_text(GTK_LABEL(GTK_BIN(previewbutton)->child), tmps);
|
||||
while(gtk_events_pending())
|
||||
gtk_main_iteration();
|
||||
}
|
||||
|
|
@ -873,11 +869,7 @@ void repaint(struct ppm *p, struct ppm *a)
|
|||
fprintf(stderr, ".\n"); fflush(stderr);
|
||||
}
|
||||
} else {
|
||||
#if GTK_MINOR_VERSION == 0
|
||||
gtk_label_set(GTK_LABEL(GTK_BUTTON(previewbutton)->child), _("Update"));
|
||||
#else
|
||||
gtk_label_set_text(GTK_LABEL(GTK_BUTTON(previewbutton)->child), _("Update"));
|
||||
#endif
|
||||
gtk_label_set_text(GTK_LABEL(GTK_BIN(previewbutton)->child), _("Update"));
|
||||
}
|
||||
running = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -807,8 +807,8 @@ open_browser_dialog (gchar *help_path,
|
|||
gtk_window_set_wmclass (GTK_WINDOW (window), "helpbrowser", "Gimp");
|
||||
gtk_window_set_title (GTK_WINDOW (window), _("GIMP Help Browser"));
|
||||
|
||||
gimp_help_connect_help_accel (window, gimp_standard_help_func,
|
||||
"dialogs/help.html");
|
||||
gimp_help_connect (window, gimp_standard_help_func,
|
||||
"dialogs/help.html");
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 0);
|
||||
gtk_container_add (GTK_CONTAINER (window), vbox);
|
||||
|
|
|
|||
|
|
@ -1570,7 +1570,7 @@ design_area_expose (GtkWidget *widget,
|
|||
ifsDesign->pixmap,
|
||||
widget->style->fg_gc[widget->state],
|
||||
ifsDesign->selected_gc,
|
||||
ifsDesign->area->style->font);
|
||||
gtk_style_get_font (ifsDesign->area->style));
|
||||
}
|
||||
|
||||
gdk_draw_drawable(widget->window,
|
||||
|
|
|
|||
|
|
@ -1333,7 +1333,7 @@ dialog(GimpDrawable *drawable)
|
|||
gtk_widget_realize(dlg);
|
||||
|
||||
main_set_title(NULL);
|
||||
gimp_help_connect_help_accel (dlg, gimp_standard_help_func, "filters/imagemap.html");
|
||||
gimp_help_connect (dlg, gimp_standard_help_func, "filters/imagemap.html");
|
||||
|
||||
gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_MOUSE);
|
||||
gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
|
||||
|
|
|
|||
|
|
@ -590,7 +590,7 @@ do_preferences_dialog(void)
|
|||
if (!dialog) {
|
||||
dialog = create_preferences_dialog();
|
||||
}
|
||||
gtk_notebook_set_page(GTK_NOTEBOOK(dialog->notebook), 0);
|
||||
gtk_notebook_set_current_page(GTK_NOTEBOOK(dialog->notebook), 0);
|
||||
dialog->old_data = old_data = get_preferences();
|
||||
dialog->new_colors = dialog->old_colors = old_data->colors;
|
||||
|
||||
|
|
|
|||
|
|
@ -291,13 +291,6 @@ OBJECTS = \
|
|||
gdyntextcompat.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_gflare
|
||||
OBJECTS = \
|
||||
asupsample.obj \
|
||||
gflare.obj \
|
||||
gtkmultioptionmenu.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_gfli
|
||||
OBJECTS = \
|
||||
fli.obj \
|
||||
|
|
@ -585,7 +578,7 @@ RTL = -MDd
|
|||
|
||||
CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200
|
||||
|
||||
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GLIB_CFLAGS) $(GTK2_CFLAGS) -I$(INTL)
|
||||
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GTK2_CFLAGS) -I$(INTL)
|
||||
|
||||
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
|
||||
|
||||
|
|
@ -618,7 +611,7 @@ $(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
|
|||
..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
|
||||
..\..\libgimpmath\gimpmath-$(GIMP_VER).lib \
|
||||
..\..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
|
||||
$(GTK2_LIBS) $(INTL_LIBS) $(GLIB_LIBS) $(EXTRALIBS) $(LDFLAGS)
|
||||
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) $(EXTRALIBS) $(LDFLAGS)
|
||||
|
||||
$(PLUGIN).res : $(PLUGIN).rc
|
||||
rc -r -fo $(PLUGIN).res $(PLUGIN).rc
|
||||
|
|
@ -662,7 +655,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 \
|
||||
$(GTK2_LIBS) $(GLIB_LIBS) /def:$(MODULE).def
|
||||
$(GLIB_LIBS) $(GTK2_LIBS) /def:$(MODULE).def
|
||||
!ENDIF
|
||||
|
||||
.c.obj :
|
||||
|
|
|
|||
Loading…
Reference in New Issue