Commit a4c1e8a5 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

new ui for the "Layer Offset" dialog.

1999-07-22  Michael Natterer  <mitschel@cs.tu-berlin.de>

	* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.

	* app/channels_dialog.c
	* app/layers_dialog.c: major code cleanup: Folded some callbacks
	into common ones, "widget" instead of "w", indentation, ...

	* app/commands.c
	* app/interface.[ch]
	* app/global_edit.c: the query boxes must be shown by the caller
	now. There's no need to split up the string for the message box
	manually as the Gtk 1.2 label widget handles newlines corectly.
	Added the "edge_lock" toggle to the "Shrink Selection" dialog.
	Nicer spacings for the query and message boxes.

	* app/ink.c: tried to grab the pointer in the blob preview but
	failed. Left the code there as a reminder (commented out).

	* app/menus.c: reordered <Image>/Select.

	I was bored and grep-ed the sources for ancient or deprecated stuff:

	* app/about_dialog.[ch]
	* app/actionarea.[ch]
	* app/app_procs.c
	* app/brush_edit.c
	* app/brush_select.c
	* app/color_select.c
	* app/convert.c
	* app/devices.c
	* app/gdisplay.c
	* app/gdisplay_ops.c
	* app/histogram_tool.[ch]
	* app/info_window.c
	* app/install.c
	* app/ops_buttons.c
	* app/palette.c
	* app/palette_select.c
	* app/paths_dialog.c
	* app/pattern_select.c
	* app/resize.c
	* app/scale_toolc.c
	* app/text_tool.c:
	s/container_border_width/container_set_border_width/g,
	s/sprintf/g_snprintf/g, replaced some constant string lengths with
	strlen(x).

	* app/bezier_select.c
	* app/blend.c
	* app/boundary.c
	* app/errors.[ch]
	* app/free_select.c
	* app/gimpbrushlist.c
	* app/gimprc.c
	* app/iscissors.c
	* app/main.c
	* app/patterns.[ch]
	* app/text_tool.c: namespace fanaticism: prefixed all gimp error
	functions with "gimp_" and formated the messages more uniformly.

	* app/gradient.c
	* app/gradient_select.c: same stuff as above for the ui
	code. There are still some sub-dialogs which need cleanup.

	Did some cleanup in most of these files: prototypes, removed tons
	of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
parent 91decb34
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-22 Tomas Ogren <stric@ing.umu.se>
* plug-ins/common/gifload.c:
......
......@@ -31,14 +31,14 @@
#include "about_dialog.h"
#define ANIMATION_STEPS 16
#define ANIMATION_SIZE 2
#define ANIMATION_SIZE 2
static int about_dialog_load_logo (GtkWidget *window);
static void about_dialog_destroy (void);
static void about_dialog_unmap (void);
static int about_dialog_logo_expose (GtkWidget *widget, GdkEventExpose *event);
static int about_dialog_button (GtkWidget *widget, GdkEventButton *event);
static int about_dialog_timer (gpointer data);
static gint about_dialog_load_logo (GtkWidget *window);
static void about_dialog_destroy (void);
static void about_dialog_unmap (void);
static gint about_dialog_logo_expose (GtkWidget *widget, GdkEventExpose *event);
static gint about_dialog_button (GtkWidget *widget, GdkEventButton *event);
static gint about_dialog_timer (gpointer data);
static GtkWidget *about_dialog = NULL;
......@@ -46,19 +46,19 @@ static GtkWidget *logo_area = NULL;
static GtkWidget *scroll_area = NULL;
static GdkPixmap *logo_pixmap = NULL;
static GdkPixmap *scroll_pixmap = NULL;
static unsigned char *dissolve_map = NULL;
static int dissolve_width;
static int dissolve_height;
static int logo_width = 0;
static int logo_height = 0;
static int do_animation = 0;
static int do_scrolling = 0;
static int scroll_state = 0;
static int frame = 0;
static int offset = 0;
static int timer = 0;
static char *scroll_text[] =
static guchar *dissolve_map = NULL;
static gint dissolve_width;
static gint dissolve_height;
static gint logo_width = 0;
static gint logo_height = 0;
static gint do_animation = 0;
static gint do_scrolling = 0;
static gint scroll_state = 0;
static gint frame = 0;
static gint offset = 0;
static gint timer = 0;
static gchar *scroll_text[] =
{
"Lauri Alanko",
"Shawn Amundson",
......@@ -130,15 +130,15 @@ static char *scroll_text[] =
"Kris Wehner",
"Matthew Wilson",
};
static int nscroll_texts = sizeof (scroll_text) / sizeof (scroll_text[0]);
static int scroll_text_widths[100] = { 0 };
static int cur_scroll_text = 0;
static int cur_scroll_index = 0;
static gint nscroll_texts = sizeof (scroll_text) / sizeof (scroll_text[0]);
static gint scroll_text_widths[100] = { 0 };
static gint cur_scroll_text = 0;
static gint cur_scroll_index = 0;
static int shuffle_array[ sizeof(scroll_text) / sizeof(scroll_text[0]) ];
static gint shuffle_array[ sizeof(scroll_text) / sizeof(scroll_text[0]) ];
void
about_dialog_create (int timeout)
about_dialog_create (gint timeout)
{
GtkStyle *style;
GtkWidget *vbox;
......@@ -172,13 +172,13 @@ about_dialog_create (int timeout)
}
vbox = gtk_vbox_new (FALSE, 1);
gtk_container_border_width (GTK_CONTAINER (vbox), 1);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 1);
gtk_container_add (GTK_CONTAINER (about_dialog), vbox);
gtk_widget_show (vbox);
aboutframe = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (aboutframe), GTK_SHADOW_IN);
gtk_container_border_width (GTK_CONTAINER (aboutframe), 0);
gtk_container_set_border_width (GTK_CONTAINER (aboutframe), 0);
gtk_box_pack_start (GTK_BOX (vbox), aboutframe, TRUE, TRUE, 0);
gtk_widget_show (aboutframe);
......@@ -193,7 +193,6 @@ about_dialog_create (int timeout)
gtk_widget_realize (logo_area);
gdk_window_set_background (logo_area->window, &logo_area->style->black);
style = gtk_style_new ();
gdk_font_unref (style->font);
style->font = gdk_font_load (_("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*"));
......@@ -212,14 +211,13 @@ about_dialog_create (int timeout)
gtk_widget_pop_style ();
alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 0);
gtk_widget_show (alignment);
aboutframe = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (aboutframe), GTK_SHADOW_IN);
gtk_container_border_width (GTK_CONTAINER (aboutframe), 0);
gtk_container_set_border_width (GTK_CONTAINER (aboutframe), 0);
gtk_container_add (GTK_CONTAINER (alignment), aboutframe);
gtk_widget_show (aboutframe);
......@@ -283,16 +281,16 @@ about_dialog_create (int timeout)
}
static int
static gint
about_dialog_load_logo (GtkWidget *window)
{
GtkWidget *preview;
GdkGC *gc;
char buf[1024];
unsigned char *pixelrow;
gchar buf[1024];
guchar *pixelrow;
FILE *fp;
int count;
int i, j, k;
gint count;
gint i, j, k;
if (logo_pixmap)
return TRUE;
......@@ -386,7 +384,7 @@ about_dialog_unmap ()
}
}
static int
static gint
about_dialog_logo_expose (GtkWidget *widget,
GdkEventExpose *event)
{
......@@ -418,7 +416,7 @@ about_dialog_logo_expose (GtkWidget *widget,
return FALSE;
}
static int
static gint
about_dialog_button (GtkWidget *widget,
GdkEventButton *event)
{
......@@ -432,7 +430,7 @@ about_dialog_button (GtkWidget *widget,
return FALSE;
}
static int
static gint
about_dialog_timer (gpointer data)
{
gint i, j, k;
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __ABOUT_DIALOG_H__
#define __ABOUT_DIALOG_H__
void about_dialog_create (int timeout);
void about_dialog_create (gint timeout);
#endif /* __ABOUT_DIALOG_H__ */
......@@ -15,36 +15,38 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "appenv.h"
#include "actionarea.h"
#include "config.h"
#include "libgimp/gimpintl.h"
void
build_action_area (GtkDialog * dlg,
ActionAreaItem * actions,
int num_actions,
int default_action)
build_action_area (GtkDialog *dlg,
ActionAreaItem *actions,
gint num_actions,
gint default_action)
{
GtkWidget *button;
int i;
GList* children;
GtkWidget* hbbox;
GList *children;
GtkWidget *hbbox;
gint i;
gtk_container_border_width (GTK_CONTAINER (dlg->action_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (dlg->action_area), 2);
gtk_box_set_homogeneous (GTK_BOX (dlg->action_area), FALSE);
children = gtk_container_children (GTK_CONTAINER (dlg->action_area));
if (children == NULL) {
/* add a right packed hbbox */
hbbox = gtk_hbutton_box_new();
gtk_button_box_set_spacing(GTK_BUTTON_BOX (hbbox), 4);
gtk_box_pack_end(GTK_BOX (dlg->action_area), hbbox, FALSE, FALSE, 0);
gtk_widget_show(hbbox);
} else {
/* get the hbbox */
hbbox = (GtkWidget*)(g_list_first(children)->data);
}
children = gtk_container_children (GTK_CONTAINER (dlg->action_area));
if (children == NULL)
{
/* add a right packed hbbox */
hbbox = gtk_hbutton_box_new ();
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
gtk_box_pack_end (GTK_BOX (dlg->action_area), hbbox, FALSE, FALSE, 0);
gtk_widget_show (hbbox);
}
else
{
/* get the hbbox */
hbbox = (GtkWidget*) (g_list_first(children)->data);
}
for (i = 0; i < num_actions; i++)
{
......
......@@ -22,17 +22,19 @@
typedef void (*ActionCallback) (GtkWidget *, gpointer);
typedef struct {
const char *label;
ActionCallback callback;
gpointer user_data;
GtkWidget *widget;
} ActionAreaItem;
typedef struct _ActionAreaItem ActionAreaItem;
void build_action_area (GtkDialog * dlg,
ActionAreaItem * actions,
int num_actions,
int default_action);
struct _ActionAreaItem
{
const gchar *label;
ActionCallback callback;
gpointer user_data;
GtkWidget *widget;
};
void build_action_area (GtkDialog *dlg,
ActionAreaItem *actions,
gint num_actions,
gint default_action);
#endif /* __ACTIONAREA_H__ */
......@@ -40,7 +40,6 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "general.h"
#include "gimage_mask.h"
#include "gimprc.h"
#include "global_edit.h"
......@@ -92,10 +91,11 @@ static void gimage_mask_grow_callback (GtkWidget *, gpointer, gpointer);
static void gimage_mask_shrink_callback (GtkWidget *, gpointer, gpointer);
/* local variables */
static gdouble selection_feather_radius = 5.0;
static gint selection_border_radius = 5;
static gint selection_grow_pixels = 1;
static gint selection_shrink_pixels = 1;
static gdouble selection_feather_radius = 5.0;
static gint selection_border_radius = 5;
static gint selection_grow_pixels = 1;
static gint selection_shrink_pixels = 1;
static gboolean selection_shrink_edge_lock = FALSE;
void
......@@ -339,15 +339,15 @@ select_border_cmd_callback (GtkWidget *widget,
GDisplay * gdisp;
return_if_no_display (gdisp);
query_size_box (N_("Border Selection"),
N_("Border selection by:"),
selection_border_radius, 1, 32767, 0,
gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
GTK_OBJECT (gdisp->gimage), "destroy",
gimage_mask_border_callback, gdisp->gimage);
gtk_widget_show (query_size_box (_("Border Selection"),
_("Border selection by:"),
selection_border_radius, 1, 32767, 0,
gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
GTK_OBJECT (gdisp->gimage), "destroy",
gimage_mask_border_callback, gdisp->gimage));
}
void
......@@ -357,15 +357,15 @@ select_feather_cmd_callback (GtkWidget *widget,
GDisplay * gdisp;
return_if_no_display (gdisp);
query_size_box (N_("Feather Selection"),
N_("Feather selection by:"),
selection_feather_radius, 0, 32767, 3,
gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
GTK_OBJECT (gdisp->gimage), "destroy",
gimage_mask_feather_callback, gdisp->gimage);
gtk_widget_show (query_size_box (_("Feather Selection"),
_("Feather selection by:"),
selection_feather_radius, 0, 32767, 3,
gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
GTK_OBJECT (gdisp->gimage), "destroy",
gimage_mask_feather_callback, gdisp->gimage));
}
void
......@@ -375,33 +375,48 @@ select_grow_cmd_callback (GtkWidget *widget,
GDisplay * gdisp;
return_if_no_display (gdisp);
query_size_box (N_("Grow Selection"),
N_("Grow selection by:"),
selection_grow_pixels, 1, 32767, 0,
gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
GTK_OBJECT (gdisp->gimage), "destroy",
gimage_mask_grow_callback, gdisp->gimage);
gtk_widget_show (query_size_box (_("Grow Selection"),
_("Grow selection by:"),
selection_grow_pixels, 1, 32767, 0,
gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
GTK_OBJECT (gdisp->gimage), "destroy",
gimage_mask_grow_callback, gdisp->gimage));
}
void
select_shrink_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GtkWidget *edge_lock;
GtkWidget *shrink_dialog;
GDisplay * gdisp;
return_if_no_display (gdisp);
query_size_box (N_("Shrink Selection"),
N_("Shrink selection by:"),
selection_shrink_pixels, 1, 32767, 0,
gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
GTK_OBJECT (gdisp->gimage), "destroy",
gimage_mask_shrink_callback, gdisp->gimage);
shrink_dialog = query_size_box (N_("Shrink Selection"),
N_("Shrink selection by:"),
selection_shrink_pixels, 1, 32767, 0,
gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
GTK_OBJECT (gdisp->gimage), "destroy",
gimage_mask_shrink_callback, gdisp->gimage);
edge_lock = gtk_check_button_new_with_label (_("Shrink from image border"));
/* eeek */
gtk_box_pack_start (GTK_BOX (g_list_nth_data (gtk_container_children (GTK_CONTAINER (GTK_DIALOG (shrink_dialog)->vbox)), 0)), edge_lock,
FALSE, FALSE, 0);
gtk_object_set_data (GTK_OBJECT (shrink_dialog), "edge_lock_toggle",
edge_lock);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edge_lock),
! selection_shrink_edge_lock);
gtk_widget_show (edge_lock);
gtk_widget_show (shrink_dialog);
}
void
......@@ -1263,24 +1278,26 @@ image_cancel_callback (GtkWidget *w,
}
static void
gimage_mask_feather_callback (GtkWidget *w,
gimage_mask_feather_callback (GtkWidget *widget,
gpointer client_data,
gpointer call_data)
{
GImage *gimage = GIMP_IMAGE (client_data);
GImage *gimage;
GUnit unit;
gdouble radius_x;
gdouble radius_y;
selection_feather_radius = *(double*) call_data;
gimage = GIMP_IMAGE (client_data);
selection_feather_radius = *(gdouble*) call_data;
g_free (call_data);
unit = (GUnit) gtk_object_get_data (GTK_OBJECT (w), "size_query_unit");
unit = (GUnit) gtk_object_get_data (GTK_OBJECT (widget), "size_query_unit");
radius_x = radius_y = selection_feather_radius;
if (unit != UNIT_PIXEL)
{
double factor;
gdouble factor;
factor = (MAX (gimage->xresolution, gimage->yresolution) /
MIN (gimage->xresolution, gimage->yresolution));
......@@ -1297,24 +1314,26 @@ gimage_mask_feather_callback (GtkWidget *w,
static void
gimage_mask_border_callback (GtkWidget *w,
gimage_mask_border_callback (GtkWidget *widget,
gpointer client_data,
gpointer call_data)
{
GImage *gimage = GIMP_IMAGE (client_data);
GImage *gimage;
GUnit unit;
gdouble radius_x;
gdouble radius_y;
selection_border_radius = (int) (*(double*) call_data + 0.5);
gimage = GIMP_IMAGE (client_data);
selection_border_radius = (int) (*(gdouble*) call_data + 0.5);
g_free (call_data);
unit = (GUnit) gtk_object_get_data (GTK_OBJECT (w), "size_query_unit");
unit = (GUnit) gtk_object_get_data (GTK_OBJECT (widget), "size_query_unit");
radius_x = radius_y = selection_feather_radius;
if (unit != UNIT_PIXEL)
{
double factor;
gdouble factor;
factor = (MAX (gimage->xresolution, gimage->yresolution) /
MIN (gimage->xresolution, gimage->yresolution));
......@@ -1331,24 +1350,26 @@ gimage_mask_border_callback (GtkWidget *w,
static void
gimage_mask_grow_callback (GtkWidget *w,
gimage_mask_grow_callback (GtkWidget *widget,
gpointer client_data,
gpointer call_data)
{
GImage *gimage = GIMP_IMAGE (client_data);
GImage *gimage;
GUnit unit;
gdouble radius_x;
gdouble radius_y;
selection_grow_pixels = (int) (*(double*) call_data + 0.5);
gimage = GIMP_IMAGE (client_data);
selection_grow_pixels = (int) (*(gdouble*) call_data + 0.5);
g_free (call_data);
unit = (GUnit) gtk_object_get_data (GTK_OBJECT (w), "size_query_unit");
unit = (GUnit) gtk_object_get_data (GTK_OBJECT (widget), "size_query_unit");
radius_x = radius_y = selection_grow_pixels;
if (unit != UNIT_PIXEL)
{
double factor;
gdouble factor;
factor = (MAX (gimage->xresolution, gimage->yresolution) /
MIN (gimage->xresolution, gimage->yresolution));
......@@ -1365,24 +1386,30 @@ gimage_mask_grow_callback (GtkWidget *w,
static void
gimage_mask_shrink_callback (GtkWidget *w,
gimage_mask_shrink_callback (GtkWidget *widget,
gpointer client_data,
gpointer call_data)
{
GImage *gimage = GIMP_IMAGE (client_data);
GUnit unit;
gint radius_x;
gint radius_y;
GImage *gimage;
GUnit unit;
gint radius_x;
gint radius_y;
selection_shrink_pixels = (int) (*(double*) call_data + 0.5);
gimage = GIMP_IMAGE (client_data);
selection_shrink_pixels = (int) (*(gdouble*) call_data + 0.5);
g_free (call_data);
unit = (GUnit) gtk_object_get_data (GTK_OBJECT (w), "size_query_unit");
unit = (GUnit) gtk_object_get_data (GTK_OBJECT (widget), "size_query_unit");
radius_x = radius_y = selection_shrink_pixels;
selection_shrink_edge_lock =
! GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (widget),
"edge_lock_toggle"))->active;
if (unit != UNIT_PIXEL)
{
double factor;
gdouble factor;
factor = (MAX (gimage->xresolution, gimage->yresolution) /
MIN (gimage->xresolution, gimage->yresolution));
......@@ -1393,6 +1420,6 @@ gimage_mask_shrink_callback (GtkWidget *w,
radius_x *= factor;
}
gimage_mask_shrink (gimage, radius_x, radius_y, FALSE);
gimage_mask_shrink (gimage, radius_x, radius_y, selection_shrink_edge_lock);
gdisplays_flush ();
}
......@@ -732,7 +732,7 @@ really_quit_dialog (void)
gtk_window_set_wmclass (GTK_WINDOW (dialog), "really_quit", "Gimp");
gtk_window_set_title (GTK_WINDOW (dialog), _("Really Quit?"));
gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
(GtkSignalFunc) really_quit_delete_callback,
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
......@@ -16,16 +15,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdlib.h>
#include <string.h>
#include "appenv.h"
#include "errors.h"
#include "boundary.h"
#include "tile.h"
#include "libgimp/gimpintl.h"
#include "tile.h"
/* half intensity for mask */
#define HALF_WAY 127
......@@ -202,7 +199,7 @@ make_seg (int x1,
sizeof (BoundSeg) * max_segs);
if (!tmp_segs)
fatal_error ("Unable to reallocate segments array for mask boundary.");
gimp_fatal_error (_("make_seg(): Unable to reallocate segments array for mask boundary."));
}
tmp_segs[num_segs].x1 = x1;
......@@ -244,7 +241,7 @@ allocate_empty_segs (void)
empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs);
if (!empty_segs_n || !empty_segs_l || !empty_segs_c)
fatal_error ("Unable to reallocate empty segments array for mask boundary.");
gimp_fatal_error (_("allocate_empty_segs(): Unable to reallocate empty segments array for mask boundary."));
}
}
......
......@@ -15,11 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"