Commit d9a29e1a authored by Mukund Sivaraman's avatar Mukund Sivaraman Committed by Mukund Sivaraman
Browse files

plug-ins/imagemap/imap_cmd_guides.c plug-ins/imagemap/imap_main.c

2007-02-12  Mukund Sivaraman <muks@mukund.org>

        * plug-ins/imagemap/imap_cmd_guides.c
        * plug-ins/imagemap/imap_main.c
        * plug-ins/imagemap/imap_main.h
        * plug-ins/imagemap/imap_menu.c
        * plug-ins/imagemap/imap_object.c
        * plug-ins/imagemap/imap_preferences.h
        * plug-ins/imagemap/imap_object.h: Cleaned up some warnings in
        the imagemap plug-in; also fixed many function declarations.


svn path=/trunk/; revision=21904
parent a08b91c7
2007-02-12 Mukund Sivaraman <muks@mukund.org>
* plug-ins/imagemap/imap_cmd_guides.c
* plug-ins/imagemap/imap_main.c
* plug-ins/imagemap/imap_main.h
* plug-ins/imagemap/imap_menu.c
* plug-ins/imagemap/imap_object.c
* plug-ins/imagemap/imap_preferences.h
* plug-ins/imagemap/imap_object.h: Cleaned up some warnings in
the imagemap plug-in; also fixed many function declarations.
2007-02-12 Sven Neumann <sven@gimp.org> 2007-02-12 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpstringcombobox.c: fixed some issues with the * libgimpwidgets/gimpstringcombobox.c: fixed some issues with the
...@@ -239,7 +239,7 @@ init_guides_dialog(GuidesDialog_t *dialog, ObjectList_t *list) ...@@ -239,7 +239,7 @@ init_guides_dialog(GuidesDialog_t *dialog, ObjectList_t *list)
} }
static void static void
do_create_guides_dialog(ObjectList_t *list) do_create_guides_dialog_local (ObjectList_t *list)
{ {
static GuidesDialog_t *dialog; static GuidesDialog_t *dialog;
...@@ -276,6 +276,6 @@ static CmdExecuteValue_t ...@@ -276,6 +276,6 @@ static CmdExecuteValue_t
guides_command_execute(Command_t *parent) guides_command_execute(Command_t *parent)
{ {
GuidesCommand_t *command = (GuidesCommand_t*) parent; GuidesCommand_t *command = (GuidesCommand_t*) parent;
do_create_guides_dialog(command->list); do_create_guides_dialog_local (command->list);
return CMD_DESTRUCT; return CMD_DESTRUCT;
} }
...@@ -64,6 +64,9 @@ ...@@ -64,6 +64,9 @@
#define PLUG_IN_PROC "plug-in-imagemap" #define PLUG_IN_PROC "plug-in-imagemap"
static gint zoom_in (void);
static gint zoom_out (void);
/* Global variables */ /* Global variables */
static MapInfo_t _map_info; static MapInfo_t _map_info;
...@@ -75,7 +78,7 @@ static GimpDrawable *_drawable; ...@@ -75,7 +78,7 @@ static GimpDrawable *_drawable;
static GdkCursorType _cursor = GDK_TOP_LEFT_ARROW; static GdkCursorType _cursor = GDK_TOP_LEFT_ARROW;
static gboolean _show_url = TRUE; static gboolean _show_url = TRUE;
static gchar *_filename = NULL; static gchar *_filename = NULL;
static char *_image_name; static gchar *_image_name;
static gint _image_width; static gint _image_width;
static gint _image_height; static gint _image_height;
static GtkWidget *_dlg; static GtkWidget *_dlg;
...@@ -283,7 +286,7 @@ zoom_in(void) ...@@ -283,7 +286,7 @@ zoom_in(void)
return _zoom_factor; return _zoom_factor;
} }
gint static gint
zoom_out(void) zoom_out(void)
{ {
if (_zoom_factor > 1) { if (_zoom_factor > 1) {
...@@ -398,7 +401,7 @@ set_zoom_factor (GtkRadioAction *action, GtkRadioAction *current, ...@@ -398,7 +401,7 @@ set_zoom_factor (GtkRadioAction *action, GtkRadioAction *current,
set_zoom (factor + 1); set_zoom (factor + 1);
} }
const char* const gchar *
get_image_name(void) get_image_name(void)
{ {
return _image_name; return _image_name;
......
...@@ -91,4 +91,32 @@ void preview_thaw(void); ...@@ -91,4 +91,32 @@ void preview_thaw(void);
void show_url(void); void show_url(void);
void hide_url(void); void hide_url(void);
void set_preview_color (GtkRadioAction *action, GtkRadioAction *current,
gpointer user_data);
void set_zoom_factor (GtkRadioAction *action, GtkRadioAction *current,
gpointer user_data);
void set_func (GtkRadioAction *action, GtkRadioAction *current,
gpointer user_data);
void do_edit_selected_shape (void);
void do_zoom_in (void);
void do_zoom_out (void);
void do_close (void);
void do_quit (void);
void do_cut (void);
void do_copy (void);
void do_paste (void);
void do_select_all (void);
void do_deselect_all (void);
void do_clear (void);
void do_move_up (void);
void do_move_down (void);
void do_move_to_front (void);
void do_send_to_back (void);
void do_use_gimp_guides_dialog (void);
void do_create_guides_dialog (void);
void save (void);
void imap_help (void);
void toggle_area_list (void);
const gchar * get_image_name (void);
#endif /* _IMAP_MAIN_H */ #endif /* _IMAP_MAIN_H */
...@@ -43,32 +43,6 @@ ...@@ -43,32 +43,6 @@
#include "libgimp/stdplugins-intl.h" #include "libgimp/stdplugins-intl.h"
/* Fix me: move all of these prototypes to imap_menu.h */
void save();
void do_close();
void do_quit();
void do_cut();
void do_copy();
void do_paste();
void do_clear();
void do_select_all();
void do_deselect_all();
void do_grid_settings_dialog();
void do_zoom_in();
void do_zoom_out();
void do_move_to_front();
void do_send_to_back();
void do_edit_selected_shape();
void do_create_guides_dialog();
void do_use_gimp_guides_dialog();
void imap_help();
void set_func(int func);
void set_preview_color();
void set_zoom_factor();
void toggle_area_list();
static Menu_t _menu; static Menu_t _menu;
static GtkUIManager *ui_manager; static GtkUIManager *ui_manager;
......
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
#include "imap_object.h" #include "imap_object.h"
#include "imap_string.h" #include "imap_string.h"
static Object_t* object_factory_create_object (ObjectFactory_t *factory,
gint x, gint y);
typedef struct { typedef struct {
ObjectListCallbackFunc_t func; ObjectListCallbackFunc_t func;
gpointer data; gpointer data;
......
...@@ -160,7 +160,7 @@ struct ObjectList_t { ...@@ -160,7 +160,7 @@ struct ObjectList_t {
ObjectListCallback_t geometry_cb; ObjectListCallback_t geometry_cb;
}; };
ObjectList_t *make_object_list(); ObjectList_t *make_object_list (void);
void object_list_destruct(ObjectList_t *list); void object_list_destruct(ObjectList_t *list);
ObjectList_t *object_list_copy(ObjectList_t *des, ObjectList_t *src); ObjectList_t *object_list_copy(ObjectList_t *des, ObjectList_t *src);
ObjectList_t *object_list_append_list(ObjectList_t *des, ObjectList_t *src); ObjectList_t *object_list_append_list(ObjectList_t *des, ObjectList_t *src);
......
...@@ -50,7 +50,7 @@ typedef struct { ...@@ -50,7 +50,7 @@ typedef struct {
GdkGC *selected_gc; GdkGC *selected_gc;
} PreferencesData_t; } PreferencesData_t;
void do_preferences_dialog(); void do_preferences_dialog(void);
gboolean preferences_load(PreferencesData_t *data); gboolean preferences_load(PreferencesData_t *data);
void preferences_save(PreferencesData_t *data); void preferences_save(PreferencesData_t *data);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment