Commit 90b2de50 authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

app/undo_history.c libgimp/gimpmenu.c plug-ins/Lighting/lighting_preview.c

2003-01-30  Manish Singh  <yosh@gimp.org>

        * app/undo_history.c
        * libgimp/gimpmenu.c
        * plug-ins/Lighting/lighting_preview.c
        * plug-ins/common/animationplay.c
        * plug-ins/common/jpeg.c
        * plug-ins/common/screenshot.c
        * plug-ins/gap/gap_navigator_dialog.c
        * plug-ins/gflare/gflare.c
        * plug-ins/ifscompose/ifscompose.c
        * plug-ins/imagemap/imap_main.c
        * plug-ins/imagemap/imap_polygon.c: changed gtk_{timeout,idle} stuff
        to their glib equivalents. Minor cleanups also with support code.

        * plug-ins/dbbrowser/dbbrowser_utils.c (gimp_db_browser): use
        gtk_entry_set_activates_default()
parent e717e073
2003-01-30 Manish Singh <yosh@gimp.org>
* app/undo_history.c
* libgimp/gimpmenu.c
* plug-ins/Lighting/lighting_preview.c
* plug-ins/common/animationplay.c
* plug-ins/common/jpeg.c
* plug-ins/common/screenshot.c
* plug-ins/gap/gap_navigator_dialog.c
* plug-ins/gflare/gflare.c
* plug-ins/ifscompose/ifscompose.c
* plug-ins/imagemap/imap_main.c
* plug-ins/imagemap/imap_polygon.c: changed gtk_{timeout,idle} stuff
to their glib equivalents. Minor cleanups also with support code.
* plug-ins/dbbrowser/dbbrowser_utils.c (gimp_db_browser): use
gtk_entry_set_activates_default()
2003-01-30 Seth Burgess <sjburges@gimp.org>
* plug-ins/common/laplace.c: fixed off-by-1 error that caused
......
......@@ -419,7 +419,7 @@ undo_history_set_pixmap_idle (gpointer data)
return (FALSE);
}
/* check if a preview is already made, otherwise gtk_idle_add the pixmap func */
/* check if a preview is already made, otherwise g_idle_add the pixmap func */
static void
undo_history_set_pixmap (GtkCList *clist,
gint row,
......@@ -436,7 +436,7 @@ undo_history_set_pixmap (GtkCList *clist,
idle.size = size;
idle.gimage = gimage;
gtk_idle_add ((GtkFunction)undo_history_set_pixmap_idle, &idle);
g_idle_add (undo_history_set_pixmap_idle, &idle);
}
......
......@@ -87,9 +87,9 @@ typedef struct _GimpGradientData GimpGradientData;
static void gimp_menu_callback (GtkWidget *widget,
gint32 *id);
static void do_brush_callback (GimpBrushData *bdata);
static gint idle_test_brush (GimpBrushData *bdata);
static gint idle_test_pattern (GimpPatternData *pdata);
static gint idle_test_gradient (GimpGradientData *gdata);
static gint idle_test_brush (gpointer bdata);
static gint idle_test_pattern (gpointer pdata);
static gint idle_test_gradient (gpointer gdata);
static void temp_brush_invoker (gchar *name,
gint nparams,
GimpParam *param,
......@@ -782,7 +782,7 @@ do_gradient_callback (GimpGradientData *gdata)
}
static gint
idle_test_brush (GimpBrushData *bdata)
idle_test_brush (gpointer bdata)
{
do_brush_callback (bdata);
......@@ -791,7 +791,7 @@ idle_test_brush (GimpBrushData *bdata)
static gint
idle_test_pattern (GimpPatternData *pdata)
idle_test_pattern (gpointer pdata)
{
do_pattern_callback (pdata);
......@@ -799,7 +799,7 @@ idle_test_pattern (GimpPatternData *pdata)
}
static gint
idle_test_gradient (GimpGradientData *gdata)
idle_test_gradient (gpointer gdata)
{
do_gradient_callback (gdata);
......@@ -837,7 +837,7 @@ temp_brush_invoker (gchar *name,
active_brush_pdb = bdata;
bdata->busy = TRUE;
gtk_idle_add ((GtkFunction)idle_test_brush, active_brush_pdb);
g_idle_add (idle_test_brush, active_brush_pdb);
}
*nreturn_vals = 1;
......@@ -876,7 +876,7 @@ temp_pattern_invoker (gchar *name,
active_pattern_pdb = pdata;
pdata->busy = TRUE;
gtk_idle_add ((GtkFunction)idle_test_pattern, active_pattern_pdb);
g_idle_add (idle_test_pattern, active_pattern_pdb);
}
*nreturn_vals = 1;
......@@ -922,7 +922,7 @@ temp_gradient_invoker (gchar *name,
gdata->closing = param[3].data.d_int32;
active_gradient_pdb = gdata;
gdata->busy = TRUE;
gtk_idle_add ((GtkFunction)idle_test_gradient, active_gradient_pdb);
g_idle_add (idle_test_gradient, active_gradient_pdb);
}
}
......
......@@ -210,9 +210,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
g_signal_connect_swapped (dbbrowser->search_entry, "activate",
G_CALLBACK (gtk_window_activate_default),
dbbrowser->dialog);
gtk_entry_set_activates_default (GTK_ENTRY (dbbrowser->search_entry), TRUE);
gtk_box_pack_start (GTK_BOX (searchhbox), dbbrowser->search_entry,
TRUE, TRUE, 0);
gtk_widget_show (dbbrowser->search_entry);
......
......@@ -210,9 +210,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
g_signal_connect_swapped (dbbrowser->search_entry, "activate",
G_CALLBACK (gtk_window_activate_default),
dbbrowser->dialog);
gtk_entry_set_activates_default (GTK_ENTRY (dbbrowser->search_entry), TRUE);
gtk_box_pack_start (GTK_BOX (searchhbox), dbbrowser->search_entry,
TRUE, TRUE, 0);
gtk_widget_show (dbbrowser->search_entry);
......
......@@ -44,8 +44,8 @@ static guint preview_update_timer = 0;
/* Protos */
/* ====== */
static void
interactive_preview_timer_callback ( void );
static gboolean
interactive_preview_timer_callback ( gpointer data );
static void
compute_preview (gint startx, gint starty, gint w, gint h)
......@@ -546,16 +546,15 @@ interactive_preview_callback (GtkWidget *widget)
{
if ( preview_update_timer != 0)
{
gtk_timeout_remove ( preview_update_timer );
g_source_remove ( preview_update_timer );
}
/* start new timer */
preview_update_timer = gtk_timeout_add(100, (GtkFunction) interactive_preview_timer_callback, NULL);
preview_update_timer = g_timeout_add(100, interactive_preview_timer_callback, NULL);
}
void
interactive_preview_timer_callback ( void )
static gboolean
interactive_preview_timer_callback ( gpointer data )
{
gtk_timeout_remove ( preview_update_timer );
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_pos_x), mapvals.lightsource.position.x);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_pos_y), mapvals.lightsource.position.y);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_pos_z), mapvals.lightsource.position.z);
......@@ -564,4 +563,8 @@ interactive_preview_timer_callback ( void )
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_dir_z), mapvals.lightsource.direction.z);
draw_preview_image (TRUE);
preview_update_timer = 0;
return FALSE;
}
......@@ -206,7 +206,7 @@ static guint frame_number;
static gint32 *layers;
static GimpDrawable *drawable;
static gboolean playing = FALSE;
static gint timer = 0;
static guint timer = 0;
static GimpImageBaseType imagetype;
static guchar *palette;
static gint ncolours;
......@@ -1391,7 +1391,7 @@ remove_timer (void)
{
if (timer)
{
gtk_timeout_remove (timer);
g_source_remove (timer);
timer = 0;
}
}
......@@ -1434,13 +1434,12 @@ window_close_callback (GtkWidget *widget,
}
static gint
advance_frame_callback (GtkWidget *widget,
gpointer data)
advance_frame_callback (gpointer data)
{
remove_timer();
timer = gtk_timeout_add (get_frame_duration((frame_number+1)%total_frames),
(GtkFunction) advance_frame_callback, NULL);
timer = g_timeout_add (get_frame_duration((frame_number+1)%total_frames),
advance_frame_callback, NULL);
do_step();
show_frame();
......@@ -1455,8 +1454,8 @@ playstop_callback (GtkWidget *widget,
if (!playing)
{ /* START PLAYING */
playing = TRUE;
timer = gtk_timeout_add (get_frame_duration(frame_number),
(GtkFunction) advance_frame_callback, NULL);
timer = g_timeout_add (get_frame_duration(frame_number),
advance_frame_callback, NULL);
}
else
{ /* STOP PLAYING */
......
......@@ -1436,7 +1436,7 @@ save_image (gchar *filename,
jerr.pub.error_exit = background_error_exit;
gtk_idle_add ((GtkFunction) background_jpeg_save, (gpointer) pp);
g_idle_add ((GSourceFunc) background_jpeg_save, pp);
/* background_jpeg_save() will cleanup as needed */
return TRUE;
......
......@@ -82,7 +82,7 @@ static gboolean shoot_dialog (void);
static void shoot_ok_callback (GtkWidget *widget,
gpointer data);
static void shoot_delay (gint32 delay);
static gint shoot_delay_callback (gpointer data);
static gboolean shoot_delay_callback (gpointer data);
/* Global Variables */
......@@ -480,12 +480,11 @@ shoot_dialog (void)
void
shoot_delay (gint delay)
{
gint timeout;
timeout = gtk_timeout_add (1000, shoot_delay_callback, &delay); gtk_main ();
g_timeout_add (1000, shoot_delay_callback, &delay);
gtk_main ();
}
gint
gboolean
shoot_delay_callback (gpointer data)
{
gint *seconds_left = (gint *)data;
......
......@@ -210,9 +210,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
g_signal_connect_swapped (dbbrowser->search_entry, "activate",
G_CALLBACK (gtk_window_activate_default),
dbbrowser->dialog);
gtk_entry_set_activates_default (GTK_ENTRY (dbbrowser->search_entry), TRUE);
gtk_box_pack_start (GTK_BOX (searchhbox), dbbrowser->search_entry,
TRUE, TRUE, 0);
gtk_widget_show (dbbrowser->search_entry);
......
......@@ -210,9 +210,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
g_signal_connect_swapped (dbbrowser->search_entry, "activate",
G_CALLBACK (gtk_window_activate_default),
dbbrowser->dialog);
gtk_entry_set_activates_default (GTK_ENTRY (dbbrowser->search_entry), TRUE);
gtk_box_pack_start (GTK_BOX (searchhbox), dbbrowser->search_entry,
TRUE, TRUE, 0);
gtk_widget_show (dbbrowser->search_entry);
......
......@@ -210,9 +210,7 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
g_signal_connect_swapped (dbbrowser->search_entry, "activate",
G_CALLBACK (gtk_window_activate_default),
dbbrowser->dialog);
gtk_entry_set_activates_default (GTK_ENTRY (dbbrowser->search_entry), TRUE);
gtk_box_pack_start (GTK_BOX (searchhbox), dbbrowser->search_entry,
TRUE, TRUE, 0);
gtk_widget_show (dbbrowser->search_entry);
......
......@@ -321,7 +321,7 @@ static void frame_widget_select_update (GtkWidget *, gpointer);
static gint frame_widget_button_events (GtkWidget *, GdkEvent *);
static gint frame_widget_preview_events (GtkWidget *, GdkEvent *);
static gint navi_dialog_poll(GtkWidget *w, gpointer data);
static gint navi_dialog_poll(gpointer data);
static void navi_dialog_update(gint32 update_flag);
static void navi_scroll_to_current_frame_nr(void);
......@@ -2422,7 +2422,7 @@ frame_widget_preview_events (GtkWidget *widget,
static gint
navi_dialog_poll(GtkWidget *w, gpointer data)
navi_dialog_poll(gpointer data)
{
gint32 frame_nr;
gint32 update_flag;
......@@ -2465,8 +2465,7 @@ navi_dialog_poll(GtkWidget *w, gpointer data)
}
/* restart timer */
naviD->timer = gtk_timeout_add(naviD->cycle_time,
(GtkFunction)navi_dialog_poll, NULL);
naviD->timer = g_timeout_add(naviD->cycle_time, navi_dialog_poll, NULL);
}
return FALSE;
}
......@@ -3117,8 +3116,7 @@ int gap_navigator(gint32 image_id)
frames_dialog_flush();
navi_scroll_to_current_frame_nr();
naviD->timer = gtk_timeout_add(naviD->cycle_time,
(GtkFunction)navi_dialog_poll, NULL);
naviD->timer = g_timeout_add(naviD->cycle_time, navi_dialog_poll, NULL);
if(gap_debug) printf("BEFORE gtk_main\n");
......
......@@ -4198,14 +4198,14 @@ preview_render_start (Preview *preview)
preview->init_done = FALSE;
preview->current_y = 0;
preview->drawn_y = 0;
preview->timeout_tag = gtk_timeout_add (100, (GtkFunction) preview_render_start_2, preview);
preview->timeout_tag = g_timeout_add (100, (GSourceFunc) preview_render_start_2, preview);
}
static gint
preview_render_start_2 (Preview *preview)
{
preview->timeout_tag = 0;
preview->idle_tag = gtk_idle_add ((GtkFunction) preview_handle_idle, preview);
preview->idle_tag = g_idle_add ((GSourceFunc) preview_handle_idle, preview);
return FALSE;
}
......@@ -4214,7 +4214,7 @@ preview_render_end (Preview *preview)
{
if (preview->timeout_tag > 0)
{
gtk_timeout_remove (preview->timeout_tag);
g_source_remove (preview->timeout_tag);
preview->timeout_tag = 0;
}
if (preview->idle_tag > 0)
......@@ -4222,7 +4222,7 @@ preview_render_end (Preview *preview)
if (preview->deinit_func)
(*preview->deinit_func) (preview, preview->deinit_data);
gtk_idle_remove (preview->idle_tag);
g_source_remove (preview->idle_tag);
preview->idle_tag = 0;
}
}
......
......@@ -268,7 +268,7 @@ static void auto_preview_callback (GtkWidget *widget, gpointer data);
static void design_op_callback (GtkWidget *widget, gpointer data);
static void design_op_update_callback (GtkWidget *widget, gpointer data);
static void flip_check_button_callback (GtkWidget *widget, gpointer data);
static gint preview_idle_render (void);
static gint preview_idle_render (gpointer data);
static void ifs_compose_preview (void);
static void ifs_compose_set_defaults (void);
......@@ -2579,7 +2579,7 @@ ifs_compose_delete_callback (GtkWidget *widget,
}
static gint
preview_idle_render (void)
preview_idle_render (gpointer data)
{
gint width = GTK_WIDGET (ifsD->preview)->requisition.width;
gint height = GTK_WIDGET (ifsD->preview)->requisition.height;
......@@ -2640,7 +2640,7 @@ ifs_compose_preview (void)
}
if (ifsD->preview_iterations == 0)
gtk_idle_add ((GtkFunction)preview_idle_render, NULL);
g_idle_add (preview_idle_render, NULL);
ifsD->preview_iterations = ifsvals.iterations*((gdouble)width*height/
(ifsD->drawable_width*ifsD->drawable_height));
......
......@@ -1086,7 +1086,7 @@ button_press(GtkWidget* widget, GdkEventButton* event, gpointer data)
/* A few global vars for key movement */
static gint _timeout;
static guint _timeout;
static guint _keyval;
static gint _dx, _dy;
......@@ -1134,7 +1134,7 @@ key_press_cb(GtkWidget *widget, GdkEventKey *event)
preview_freeze();
if (_timeout)
gtk_timeout_remove(_timeout);
g_source_remove(_timeout);
switch (event->keyval) {
case GDK_Left:
......@@ -1172,7 +1172,7 @@ static gboolean
key_release_cb(GtkWidget *widget, GdkEventKey *event)
{
_keyval = event->keyval;
_timeout = gtk_timeout_add(250, key_timeout_cb, NULL);
_timeout = g_timeout_add(250, key_timeout_cb, NULL);
return FALSE;
}
......
......@@ -299,7 +299,7 @@ typedef struct {
GtkWidget *append;
GtkWidget *remove;
gint selected_row;
gint timeout;
guint timeout;
} PolygonProperties_t;
static void
......@@ -570,8 +570,8 @@ polygon_update_info_widget(Object_t *obj, gpointer data)
}
if (props->timeout)
gtk_timeout_remove(props->timeout);
props->timeout = gtk_timeout_add(1000, update_timeout, data);
g_source_remove(props->timeout);
props->timeout = g_timeout_add(1000, update_timeout, data);
}
static void
......
......@@ -1436,7 +1436,7 @@ save_image (gchar *filename,
jerr.pub.error_exit = background_error_exit;
gtk_idle_add ((GtkFunction) background_jpeg_save, (gpointer) pp);
g_idle_add ((GSourceFunc) background_jpeg_save, pp);
/* background_jpeg_save() will cleanup as needed */
return TRUE;
......
......@@ -1436,7 +1436,7 @@ save_image (gchar *filename,
jerr.pub.error_exit = background_error_exit;
gtk_idle_add ((GtkFunction) background_jpeg_save, (gpointer) pp);
g_idle_add ((GSourceFunc) background_jpeg_save, pp);
/* background_jpeg_save() will cleanup as needed */
return TRUE;
......
......@@ -1436,7 +1436,7 @@ save_image (gchar *filename,
jerr.pub.error_exit = background_error_exit;
gtk_idle_add ((GtkFunction) background_jpeg_save, (gpointer) pp);
g_idle_add ((GSourceFunc) background_jpeg_save, pp);
/* background_jpeg_save() will cleanup as needed */
return TRUE;
......
......@@ -1436,7 +1436,7 @@ save_image (gchar *filename,
jerr.pub.error_exit = background_error_exit;
gtk_idle_add ((GtkFunction) background_jpeg_save, (gpointer) pp);
g_idle_add ((GSourceFunc) background_jpeg_save, pp);
/* background_jpeg_save() will cleanup as needed */
return TRUE;
......
......@@ -1436,7 +1436,7 @@ save_image (gchar *filename,
jerr.pub.error_exit = background_error_exit;
gtk_idle_add ((GtkFunction) background_jpeg_save, (gpointer) pp);
g_idle_add ((GSourceFunc) background_jpeg_save, pp);
/* background_jpeg_save() will cleanup as needed */
return TRUE;
......
......@@ -1436,7 +1436,7 @@ save_image (gchar *filename,
jerr.pub.error_exit = background_error_exit;
gtk_idle_add ((GtkFunction) background_jpeg_save, (gpointer) pp);
g_idle_add ((GSourceFunc) background_jpeg_save, pp);
/* background_jpeg_save() will cleanup as needed */
return TRUE;
......
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