Skip to content

Commit 2f66b53

Browse files
jcupittjcupitt
committed
g_signal_ all done
type cast boilerplate next
1 parent f3f5e50 commit 2f66b53

14 files changed

+74
-66
lines changed

‎TODO

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
- finish changing gtk_signal_conn
1+
- rename
2+
3+
s/GTK_CHECK_CAST/G_TYPE_CHECK_INSTANCE_CAST/g
4+
s/GTK_CHECK_CLASS_CAST/G_TYPE_CHECK_CLASS_CAST/g
5+
s/GTK_CHECK_TYPE/G_TYPE_CHECK_INSTANCE_TYPE/g
6+
s/GTK_CHECK_CLASS_TYPE/G_TYPE_CHECK_CLASS_TYPE/g
7+
8+
9+
sed -f script.sed -i $1
10+
11+
12+
213

314
- redo scale along the new vipsthumbnail lines
415

‎src/conversionview.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,18 +204,18 @@ conversionview_init( Conversionview *cv )
204204
*/
205205
pane = menu_build( _( "Convert menu" ) );
206206
menu_add_but( pane, _( "_Scale" ),
207-
GTK_SIGNAL_FUNC( conversionview_scale_cb ), cv );
207+
G_CALLBACK( conversionview_scale_cb ), cv );
208208
cv->falsecolour = menu_add_tog( pane, _( "_False Color" ),
209-
GTK_SIGNAL_FUNC( conversionview_falsecolour_cb ), cv );
209+
G_CALLBACK( conversionview_falsecolour_cb ), cv );
210210
cv->type = menu_add_tog( pane, _( "_Interpret" ),
211-
GTK_SIGNAL_FUNC( conversionview_interpret_cb ), cv );
211+
G_CALLBACK( conversionview_interpret_cb ), cv );
212212
menu_add_but( pane, _( "_Reset" ),
213-
GTK_SIGNAL_FUNC( conversionview_reset_cb ), cv );
213+
G_CALLBACK( conversionview_reset_cb ), cv );
214214
menu_add_but( pane, _( "Set As Workspace _Default" ),
215-
GTK_SIGNAL_FUNC( conversionview_set_default_cb ), cv );
215+
G_CALLBACK( conversionview_set_default_cb ), cv );
216216
menu_add_sep( pane );
217217
menu_add_but( pane, GTK_STOCK_CLOSE,
218-
GTK_SIGNAL_FUNC( conversionview_hide_cb ), cv );
218+
G_CALLBACK( conversionview_hide_cb ), cv );
219219

220220
popupbutton = popupbutton_new();
221221
popupbutton_set_menu( popupbutton, pane );

‎src/idialog.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ idialog_build_ok( OKButton *ok, iDialog *idlg )
354354
GtkWidget *but;
355355

356356
but = build_button( ok->label,
357-
GTK_SIGNAL_FUNC( idialog_done_cb ), idlg );
357+
G_CALLBACK( idialog_done_cb ), idlg );
358358
idlg->ok_disp_l = g_slist_prepend( idlg->ok_disp_l, ok );
359359
idlg->ok_but_l = g_slist_prepend( idlg->ok_but_l, but );
360360
gtk_box_pack_start( GTK_BOX( idlg->bb ), but, TRUE, TRUE, 0 );
@@ -367,7 +367,7 @@ static void *
367367
idialog_build_cancel( iDialog *idlg )
368368
{
369369
idlg->but_cancel = build_button( idlg->cancel_text,
370-
GTK_SIGNAL_FUNC( idialog_cancel_cb ), idlg );
370+
G_CALLBACK( idialog_cancel_cb ), idlg );
371371
gtk_box_pack_start( GTK_BOX( idlg->bb ),
372372
idlg->but_cancel, TRUE, TRUE, 0 );
373373
gtk_widget_show( idlg->but_cancel );
@@ -472,15 +472,15 @@ idialog_build( GtkWidget *widget )
472472

473473
if( idlg->help_tag ) {
474474
idlg->but_help = build_button( GTK_STOCK_HELP,
475-
GTK_SIGNAL_FUNC( idialog_help_cb ), idlg );
475+
G_CALLBACK( idialog_help_cb ), idlg );
476476
gtk_widget_show( idlg->but_help );
477477
}
478478

479479
#else /*!OS_WIN32*/
480480

481481
if( idlg->help_tag ) {
482482
idlg->but_help = build_button( GTK_STOCK_HELP,
483-
GTK_SIGNAL_FUNC( idialog_help_cb ), idlg );
483+
G_CALLBACK( idialog_help_cb ), idlg );
484484
gtk_box_pack_end( GTK_BOX( idlg->bb ),
485485
idlg->but_help, TRUE, TRUE, 0 );
486486
gtk_button_box_set_child_secondary( GTK_BUTTON_BOX( idlg->bb ),

‎src/imagedisplay.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ struct _Imagedisplay {
5353
guint area_changed_sid;
5454
gboolean shrink_to_fit; /* Auto-shrink mode */
5555

56-
/* GCs also used by region paint.
57-
*/
58-
GdkGC *back_gc;
59-
GdkGC *top_gc;
60-
GdkGC *bottom_gc;
6156
};
6257

6358
/* Class structure.

‎src/imagepresent.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ struct _Imagepresent {
5656
GtkScrolledWindow *swin;
5757
GtkAdjustment *hadj;
5858
GtkAdjustment *vadj;
59-
GtkHRuler *hrule; /* Rulers */
59+
/*
60+
GtkHRuler *hrule;
6061
GtkVRuler *vrule;
62+
*/
6163
GtkEventBox *heb; /* EventBoxes holding rulers */
6264
GtkEventBox *veb;
6365
iWindowCursorContext *cntxt;

‎src/sliderview.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,17 @@ sliderview_init( Sliderview *sliderview )
175175
gtk_box_pack_start( GTK_BOX( hbox ),
176176
GTK_WIDGET( sliderview->tslider ), TRUE, TRUE, 6 );
177177

178-
gtk_signal_connect_object( GTK_OBJECT( sliderview->tslider ),
178+
g_signal_connect_object( sliderview->tslider,
179179
"text_changed",
180-
GTK_SIGNAL_FUNC( view_changed_cb ),
180+
G_CALLBACK( view_changed_cb ),
181181
GTK_OBJECT( sliderview ) );
182-
gtk_signal_connect_object( GTK_OBJECT( sliderview->tslider ),
182+
g_signal_connect_object( sliderview->tslider,
183183
"activate",
184-
GTK_SIGNAL_FUNC( view_activate_cb ),
185-
GTK_OBJECT( sliderview ) );
186-
gtk_signal_connect( GTK_OBJECT( sliderview->tslider ),
184+
G_CALLBACK( view_activate_cb ),
185+
G_OBJECT( sliderview ) );
186+
g_signal_connect( sliderview->tslider,
187187
"slider_changed",
188-
GTK_SIGNAL_FUNC( sliderview_change_cb ), sliderview );
188+
G_CALLBACK( sliderview_change_cb ), sliderview );
189189

190190
gtk_widget_show_all( GTK_WIDGET( sliderview ) );
191191
}

‎src/spin.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ spin_init( Spin *spin )
194194
ebox = gtk_event_box_new();
195195
set_tooltip( ebox, _( "Expand or collapse row" ) );
196196
gtk_event_box_set_visible_window( GTK_EVENT_BOX( ebox ), FALSE );
197-
gtk_signal_connect( GTK_OBJECT( ebox ), "button_press_event",
198-
GTK_SIGNAL_FUNC( spin_button_press_event_cb ), spin );
199-
gtk_signal_connect( GTK_OBJECT( ebox ), "enter_notify_event",
200-
GTK_SIGNAL_FUNC( spin_button_enter_notify_event_cb ), spin );
201-
gtk_signal_connect( GTK_OBJECT( ebox ), "leave_notify_event",
202-
GTK_SIGNAL_FUNC( spin_button_leave_notify_event_cb ), spin );
197+
g_signal_connect( ebox, "button_press_event",
198+
G_CALLBACK( spin_button_press_event_cb ), spin );
199+
g_signal_connect( ebox, "enter_notify_event",
200+
G_CALLBACK( spin_button_enter_notify_event_cb ), spin );
201+
g_signal_connect( ebox, "leave_notify_event",
202+
G_CALLBACK( spin_button_leave_notify_event_cb ), spin );
203203
gtk_box_pack_start( GTK_BOX( spin ), ebox, FALSE, FALSE, 0 );
204204
gtk_widget_show( ebox );
205205

‎src/toggleview.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ toggleview_init( Toggleview *togview )
8383
{
8484
togview->toggle = build_gtoggle( GTK_WIDGET( togview ), "" );
8585
set_tooltip( togview->toggle, _( "Left-click to change value" ) );
86-
gtk_signal_connect( GTK_OBJECT( togview->toggle ), "clicked",
87-
GTK_SIGNAL_FUNC( toggleview_change_cb ), togview );
86+
g_signal_connect( togview->toggle, "clicked",
87+
G_CALLBACK( toggleview_change_cb ), togview );
8888

8989
gtk_widget_show_all( GTK_WIDGET( togview ) );
9090
}

‎src/toolkitbrowser.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ toolkitbrowser_init( Toolkitbrowser *toolkitbrowser )
247247

248248
toolkitbrowser->top = gtk_hbox_new( FALSE, 12 );
249249
toolkitbrowser->entry = gtk_entry_new();
250-
gtk_signal_connect( GTK_OBJECT( toolkitbrowser->entry ), "changed",
251-
GTK_SIGNAL_FUNC( toolkitbrowser_entry_changed_cb ),
250+
g_signal_connect( toolkitbrowser->entry, "changed",
251+
G_CALLBACK( toolkitbrowser_entry_changed_cb ),
252252
toolkitbrowser );
253253
gtk_box_pack_end( GTK_BOX( toolkitbrowser->top ),
254254
toolkitbrowser->entry, FALSE, FALSE, 2 );

‎src/toolview.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,16 @@ toolview_refresh_sub( Toolview *tview,
161161
image_new_from_file( toolitem->icon ) );
162162

163163
if( !toolitem->is_pullright )
164-
gtk_signal_connect( GTK_OBJECT( item ), "activate",
165-
GTK_SIGNAL_FUNC( toolview_activate_cb ),
164+
g_signal_connect( item, "activate",
165+
G_CALLBACK( toolview_activate_cb ),
166166
toolitem );
167167

168168
if( toolitem->help &&
169169
!toolitem->is_pullright )
170170
set_tooltip( item, "%s", toolitem->help );
171171

172-
gtk_signal_connect( GTK_OBJECT( item ), "select",
173-
GTK_SIGNAL_FUNC( toolview_select_cb ), toolitem );
172+
g_signal_connect( item, "select",
173+
G_CALLBACK( toolview_select_cb ), toolitem );
174174

175175
/* Make a pullright and recurse if necessary
176176
*/
@@ -248,8 +248,8 @@ toolview_refresh( vObject *vobject )
248248
ws, kview->menu );
249249

250250
if( tview->item )
251-
gtk_signal_connect( GTK_OBJECT( tview->item ), "destroy",
252-
GTK_SIGNAL_FUNC( toolview_destroy_cb ), tview );
251+
g_signal_connect( tview->item, "destroy",
252+
G_CALLBACK( toolview_destroy_cb ), tview );
253253

254254
VOBJECT_CLASS( toolview_parent_class )->refresh( vobject );
255255
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy