Commit 022d73e2 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

ported fixes from stable branch (mostly missing includes of config.h),

2001-11-05  Sven Neumann  <sven@gimp.org>

        * plug-ins/imagemap/*.c: ported fixes from stable branch (mostly
        missing includes of config.h),

        * plug-ins/gimpressionist/orientmap.c: removed commented out code
        that continued to show up when grepping for deprecated GTK+ code.

        * tools/pdbgen/pdb/procedural_db.pdb: removed unneeded inclusion
        of config.h (it gets added automatically).
parent 7c2b5595
2001-11-05 Sven Neumann <sven@gimp.org>
* plug-ins/imagemap/*.c: ported fixes from stable branch (mostly
missing includes of config.h),
* plug-ins/gimpressionist/orientmap.c: removed commented out code
that continued to show up when grepping for deprecated GTK+ code.
* tools/pdbgen/pdb/procedural_db.pdb: removed unneeded inclusion
of config.h (it gets added automatically).
2001-11-02 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-scroll.c: stop synthesizing expose
......
......@@ -693,25 +693,3 @@ void create_orientmap_dialog(void)
updatevectorprev();
updateompreviewprev();
}
/*
void main(int argc, char **argv)
{
gtk_set_locale ();
gtk_init (&argc, &argv);
gtk_rc_parse ("./rc");
if(argc > 1)
readdata(argv[1]);
else {
numvect++;
vector[0].x = 0.5;
vector[0].y = 0.5;
vector[0].dir = 0.0;
vector[0].str = 1.0;
}
create_orientmap_dialog();
gtk_main();
}
*/
......@@ -21,8 +21,11 @@
*
*/
#include "config.h"
#include "imap_about.h"
#include "imap_default_dialog.h"
#include "libgimp/stdplugins-intl.h"
void
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_clear.h"
#include "imap_cmd_delete.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t clear_command_execute(Command_t *parent);
static void clear_command_undo(Command_t *parent);
static void clear_command_redo(Command_t *parent);
......
......@@ -21,7 +21,10 @@
*
*/
#include "config.h"
#include "imap_cmd_copy.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t copy_command_execute(Command_t *parent);
......
......@@ -21,7 +21,10 @@
*
*/
#include "config.h"
#include "imap_cmd_copy_object.h"
#include "libgimp/stdplugins-intl.h"
static void copy_object_command_destruct(Command_t *parent);
......
......@@ -21,8 +21,11 @@
*
*/
#include "config.h"
#include "imap_cmd_create.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
static CmdExecuteValue_t create_command_execute(Command_t *parent);
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_delete.h"
#include "imap_cmd_cut.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void cut_command_destruct(Command_t *parent);
static CmdExecuteValue_t cut_command_execute(Command_t *parent);
static void cut_command_undo(Command_t *parent);
......
......@@ -21,12 +21,15 @@
*
*/
#include "config.h"
#include "imap_cmd_copy_object.h"
#include "imap_cmd_cut_object.h"
#include "imap_cmd_delete.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t cut_object_command_execute(Command_t *parent);
static void cut_object_command_undo(Command_t *parent);
static void cut_object_command_redo(Command_t *parent);
......
......@@ -21,10 +21,13 @@
*
*/
#include "config.h"
#include "imap_cmd_delete.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void delete_command_destruct(Command_t *parent);
static CmdExecuteValue_t delete_command_execute(Command_t *parent);
static void delete_command_undo(Command_t *parent);
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_delete_point.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "imap_polygon.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t delete_point_command_execute(Command_t *parent);
static void delete_point_command_undo(Command_t *parent);
......
......@@ -21,10 +21,13 @@
*
*/
#include "config.h"
#include "imap_cmd_edit_object.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void edit_object_command_destruct(Command_t *parent);
static void edit_object_command_undo(Command_t *parent);
......
......@@ -21,17 +21,19 @@
*
*/
#include "config.h"
#include <stdio.h>
#include "config.h"
#include "imap_cmd_create.h"
#include "imap_default_dialog.h"
#include "imap_cmd_guides.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "imap_rectangle.h"
#include "imap_table.h"
#include "libgimp/stdplugins-intl.h"
typedef struct {
DefaultDialog_t *dialog;
GtkWidget *image_dimensions;
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_insert_point.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "imap_polygon.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t insert_point_command_execute(Command_t *parent);
static void insert_point_command_undo(Command_t *parent);
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_move.h"
#include "imap_cmd_object_move.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void move_command_destruct(Command_t *parent);
static CmdExecuteValue_t move_command_execute(Command_t *parent);
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_copy.h"
#include "imap_cmd_object_down.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t move_down_command_execute(Command_t *parent);
static void move_down_command_undo(Command_t *parent);
static void move_down_command_redo(Command_t *parent);
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_copy.h"
#include "imap_cmd_edit_object.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
COMMAND_PROTO(move_sash_command);
CommandClass_t move_sash_command_class = {
......
......@@ -21,10 +21,13 @@
*
*/
#include "config.h"
#include "imap_cmd_move_selected.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t move_selected_command_execute(Command_t *parent);
static void move_selected_command_undo(Command_t *parent);
......
......@@ -21,11 +21,15 @@
*
*/
#include "config.h"
#include "imap_cmd_create.h"
#include "imap_cmd_delete.h"
#include "imap_cmd_move_to_front.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t move_to_front_command_execute(Command_t *parent);
static void move_to_front_command_undo(Command_t *parent);
static void move_to_front_command_redo(Command_t *parent);
......@@ -47,7 +51,7 @@ move_to_front_command_new(ObjectList_t *list)
{
MoveToFrontCommand_t *command = g_new(MoveToFrontCommand_t, 1);
command->list = list;
return command_init(&command->parent, "Move To Front",
return command_init(&command->parent, _("Move To Front"),
&move_to_front_command_class);
}
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_move_up.h"
#include "imap_cmd_object_up.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t move_up_command_execute(Command_t *parent);
static void move_up_command_undo(Command_t *parent);
static void move_up_command_redo(Command_t *parent);
......
......@@ -21,10 +21,13 @@
*
*/
#include "config.h"
#include "imap_cmd_copy.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void object_down_command_destruct(Command_t *parent);
static CmdExecuteValue_t object_down_command_execute(Command_t *parent);
static void object_down_command_undo(Command_t *parent);
......
......@@ -21,10 +21,13 @@
*
*/
#include "config.h"
#include "imap_cmd_object_move.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void object_move_command_destruct(Command_t *parent);
static CmdExecuteValue_t object_move_command_execute(Command_t *parent);
static void object_move_command_undo(Command_t *parent);
......
......@@ -21,10 +21,13 @@
*
*/
#include "config.h"
#include "imap_cmd_copy.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void object_up_command_destruct(Command_t *parent);
static CmdExecuteValue_t object_up_command_execute(Command_t *parent);
static void object_up_command_undo(Command_t *parent);
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_create.h"
#include "imap_cmd_paste.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t paste_command_execute(Command_t *parent);
static CommandClass_t paste_command_class = {
......
......@@ -21,10 +21,13 @@
*
*/
#include "config.h"
#include "imap_cmd_select.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void select_command_destruct(Command_t *parent);
static CmdExecuteValue_t select_command_execute(Command_t *parent);
static void select_command_undo(Command_t *parent);
......
......@@ -21,11 +21,14 @@
*
*/
#include "config.h"
#include "imap_cmd_select.h"
#include "imap_cmd_select_all.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t select_all_command_execute(Command_t *parent);
static void select_all_command_undo(Command_t *parent);
static void select_all_command_redo(Command_t *parent);
......
......@@ -21,12 +21,16 @@
*
*/
#include "config.h"
#include "imap_cmd_select.h"
#include "imap_cmd_select_next.h"
#include "imap_cmd_unselect.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t select_next_command_execute(Command_t *parent);
static void select_next_command_undo(Command_t *command);
static void select_next_command_redo(Command_t *command);
......
......@@ -21,11 +21,15 @@
*
*/
#include "config.h"
#include "imap_cmd_select.h"
#include "imap_cmd_select_prev.h"
#include "imap_cmd_unselect.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t select_prev_command_execute(Command_t *parent);
static void select_prev_command_undo(Command_t *command);
static void select_prev_command_redo(Command_t *command);
......@@ -47,7 +51,7 @@ select_prev_command_new(ObjectList_t *list)
{
SelectPrevCommand_t *command = g_new(SelectPrevCommand_t, 1);
command->list = list;
return command_init(&command->parent, "Select Previous",
return command_init(&command->parent, _("Select Previous"),
&select_prev_command_class);
}
......
......@@ -21,13 +21,16 @@
*
*/
#include "config.h"
#include "imap_rectangle.h"
#include "imap_cmd_select.h"
#include "imap_cmd_select_region.h"
#include "imap_cmd_unselect_all.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t select_region_command_execute(Command_t *parent);
static void select_region_command_undo(Command_t *parent);
static void select_region_command_redo(Command_t *parent);
......
......@@ -21,12 +21,15 @@
*
*/
#include "config.h"
#include "imap_cmd_create.h"
#include "imap_cmd_delete.h"
#include "imap_cmd_send_to_back.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t send_to_back_command_execute(Command_t *parent);
static void send_to_back_command_undo(Command_t *parent);
static void send_to_back_command_redo(Command_t *parent);
......
......@@ -21,10 +21,13 @@
*
*/
#include "config.h"
#include "imap_cmd_unselect.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void unselect_command_destruct(Command_t *parent);
static CmdExecuteValue_t unselect_command_execute(Command_t *parent);
static void unselect_command_undo(Command_t *parent);
......
......@@ -20,6 +20,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
#include "config.h"
#include <stdarg.h>
......
......@@ -21,12 +21,11 @@
*
*/
#include "config.h"
#include <sys/types.h>
#include <sys/stat.h>
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_circle.h"
#include "imap_file.h"
#include "imap_grid.h"
......@@ -41,6 +40,8 @@
#include "imap_source.h"
#include "imap_tools.h"
#include "libgimp/stdplugins-intl.h"
static gint _menu_callback_lock;
static Menu_t _menu;
......@@ -240,7 +241,8 @@ command_list_changed(Command_t *command, gpointer data)
/* Set undo entry */
if (_menu.undo)
gtk_widget_destroy(_menu.undo);
scratch = g_strdup_printf (_("Undo %s"), (command) ? command->name : "");
scratch = g_strdup_printf (_("Undo %s"),
command && command->name ? command->name : "");
_menu.undo = insert_item_with_label(_menu.edit_menu, 1, scratch,
menu_command, &_menu.cmd_undo);
g_free (scratch);
......@@ -251,7 +253,8 @@ command_list_changed(Command_t *command, gpointer data)
command = command_list_get_redo_command();
if (_menu.redo)
gtk_widget_destroy(_menu.redo);
scratch = g_strdup_printf (_("Redo %s"), (command) ? command->name : "");
scratch = g_strdup_printf (_("Redo %s"),
command && command->name ? command->name : "");
_menu.redo = insert_item_with_label(_menu.edit_menu, 2, scratch,
menu_command, &_menu.cmd_redo);
g_free (scratch);
......
......@@ -40,7 +40,7 @@ make_toolbar_icon(GtkWidget *toolbar, GtkWidget *window, char **data,
data);
iconw = gtk_pixmap_new(icon, mask);
return gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
identifier, tooltip, "Private", iconw,
identifier, tooltip, NULL, iconw,
GTK_SIGNAL_FUNC(callback), udata);
}
......@@ -63,7 +63,7 @@ make_toolbar_radio_icon(GtkWidget *toolbar, GtkWidget *window,
iconw = gtk_pixmap_new(icon, mask);
return gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_CHILD_RADIOBUTTON, prev,
identifier, tooltip, "Private", iconw,
identifier, tooltip, NULL, iconw,
GTK_SIGNAL_FUNC(callback), udata);
}
......@@ -86,7 +86,7 @@ make_toolbar_toggle_icon(GtkWidget *toolbar, GtkWidget *window,
iconw = gtk_pixmap_new(icon, mask);
return gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
identifier, tooltip, "Private", iconw,
identifier, tooltip, NULL, iconw,
GTK_SIGNAL_FUNC(callback), udata);
}
......
......@@ -21,19 +21,21 @@
*
*/
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include "config.h"
#include "imap_cmd_delete_point.h"
#include "imap_cmd_insert_point.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "imap_misc.h"
#include "imap_object_popup.h"
#include "imap_polygon.h"
#include "imap_table.h"
#include "libgimp/stdplugins-intl.h"
#include "polygon.xpm"
#define MAX_POLYGON_POINTS 99
......
......@@ -21,14 +21,12 @@
*
*/
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "libgimp/gimp.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_command.h"
#include "imap_file.h"
#include "imap_main.h"
......@@ -38,6 +36,9 @@
#include "imap_preferences.h"
#include "imap_table.h"
#include "libgimp/gimp.h"
#include "libgimp/stdplugins-intl.h"
static gint
parse_map_type(void)
{
......
......@@ -21,19 +21,21 @@
*
*/
#include "config.h"
#include <stdio.h>
#include "config.h"
#include "imap_cmd_edit_object.h"
#include "imap_cmd_select.h"
#include "imap_cmd_unselect.h"
#include "imap_cmd_unselect_all.h"
#include "imap_edit_area_info.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "imap_misc.h"
#include "imap_selection.h"
#include "libgimp/stdplugins-intl.h"
#include "arrow_up.xpm"
#include "arrow_down.xpm"
#include "delete.xpm"
......
......@@ -22,8 +22,8 @@
*/
#include "config.h"
#include "imap_browse.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "imap_settings.h"
#include "imap_string.h"
......@@ -33,6 +33,8 @@
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
#include "libgimp/stdplugins-intl.h"
static MapFormat_t _map_format = CSIM;
static void
......
......@@ -21,14 +21,17 @@
*
*/
#include "config.h"
#include <stdarg.h>
#include <stdio.h>
#include "imap_default_dialog.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "imap_source.h"
#include "libgimp/stdplugins-intl.h"
/* FIXME: remove usage of the 'broken' GtkText */
#define GTK_ENABLE_BROKEN
#include <gtk/gtktext.h>
......
......@@ -22,11 +22,13 @@
*/
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h"
#include "imap_misc.h"
#include "imap_toolbar.h"
#include "libgimp/stdplugins-intl.h"
#include "copy.xpm"
#include "cut.xpm"
#include "grid.xpm"
......
......@@ -22,10 +22,10 @@
*/
#include "config.h"
#include "imap_circle.h"
#include "imap_edit_area_info.h"
#include "imap_main.h"