Skip to content

Commit 8c8024e

Browse files
jcupittjcupitt
committed
hack hack hack
1 parent 12e1356 commit 8c8024e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+255
-349
lines changed

‎TODO

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
- swap GTK_OBJECT for G_OBJECT or GTK_WIDGET
2+
3+
:wq
4+
5+
6+
7+
8+
9+
110
- swap
211

312
gtk_hbox_new for gtk_box_new
@@ -11,13 +20,15 @@
1120

1221
all of stock deprecated, read up on replacement
1322

14-
- remove gtk_misc, red up on replacement
23+
gtk_image_new_from_icon_name() picks an icon from the current icon theme --
24+
we need to add our custom icons to the current theme, I guess
25+
26+
- remove gtk_misc, read up on replacement
1527

1628
- swap gtk_type_new for g_object_new
1729

1830
- remove ‘gtk_object_destroy’, read up oon replacement
1931

20-
- swap GTK_OBJECT for G_OBJECT
2132

2233

2334

‎src/boxes.c

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,14 @@ box_build( iDialog *idlg,
5858
GtkWidget *hb;
5959
GtkWidget *lab;
6060

61-
hb = gtk_hbox_new( FALSE, 12 );
61+
hb = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 12 );
6262
gtk_container_border_width( GTK_CONTAINER( hb ), 0 );
6363
gtk_container_add( GTK_CONTAINER( work ), hb );
6464
gtk_widget_show( hb );
6565

66-
icon = gtk_image_new_from_stock( stock_id, GTK_ICON_SIZE_DIALOG );
67-
gtk_misc_set_alignment( GTK_MISC( icon ), 0.0, 0.0 );
66+
icon = gtk_image_new_from_icon_name( stock_id, GTK_ICON_SIZE_DIALOG );
67+
gtk_widget_set_halign( GTK_WIDGET( icon ), GTK_ALIGN_START );
68+
gtk_widget_set_valign( GTK_WIDGET( icon ), GTK_ALIGN_START );
6869
gtk_box_pack_start( GTK_BOX( hb ), icon, FALSE, FALSE, 0 );
6970
gtk_widget_show( icon );
7071

@@ -362,7 +363,7 @@ about_build( iDialog *idlg, GtkWidget *work )
362363
vips_buf_appendf( &buf, _( " of ram highwater mark" ) );
363364
vips_buf_appends( &buf, "\n" );
364365

365-
hb = gtk_hbox_new( FALSE, 0 );
366+
hb = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 0 );
366367
gtk_container_border_width( GTK_CONTAINER( hb ), 10 );
367368
gtk_container_add( GTK_CONTAINER( work ), hb );
368369
gtk_widget_show( hb );
@@ -462,21 +463,20 @@ stringset_child_new( Stringset *ss,
462463
}
463464

464465
static void
465-
stringset_destroy( GtkObject *object )
466+
stringset_destroy( GtkWidget *widget )
466467
{
467468
Stringset *ss;
468469

469-
g_return_if_fail( object != NULL );
470-
g_return_if_fail( IS_STRINGSET( object ) );
470+
g_return_if_fail( widget != NULL );
471+
g_return_if_fail( IS_STRINGSET( widget ) );
471472

472-
ss = STRINGSET( object );
473+
ss = STRINGSET( widget );
473474

474475
slist_map( ss->children,
475476
(SListMapFn) stringset_child_destroy, NULL );
476477
UNREF( ss->group );
477478

478-
if( GTK_OBJECT_CLASS( stringset_parent_class )->destroy )
479-
GTK_OBJECT_CLASS( stringset_parent_class )->destroy( object );
479+
GTK_WIDGET_CLASS( stringset_parent_class )->destroy( widget );
480480
}
481481

482482
static void *
@@ -527,13 +527,11 @@ stringset_build( GtkWidget *widget )
527527
static void
528528
stringset_class_init( StringsetClass *class )
529529
{
530-
GtkObjectClass *object_class;
531-
iWindowClass *iwindow_class;
530+
GtkWidgetClass *widget_class = (GtkWidgetClass *) class;
531+
iWindowClass *iwindow_class = (iWindowClass *) class;
532532

533-
object_class = (GtkObjectClass *) class;
534-
iwindow_class = (iWindowClass *) class;
533+
widget_class->destroy = stringset_destroy;
535534

536-
object_class->destroy = stringset_destroy;
537535
iwindow_class->build = stringset_build;
538536
}
539537

@@ -550,7 +548,7 @@ stringset_init( Stringset *ss )
550548
GtkWidget *
551549
stringset_new( void )
552550
{
553-
Stringset *ss = gtk_type_new( TYPE_STRINGSET );
551+
Stringset *ss = g_object_new( TYPE_STRINGSET, NULL );
554552

555553
return( GTK_WIDGET( ss ) );
556554
}
@@ -619,7 +617,7 @@ find_init( Find *find )
619617
GtkWidget *
620618
find_new( void )
621619
{
622-
Find *find = gtk_type_new( TYPE_FIND );
620+
Find *find = g_object_new( TYPE_FIND, NULL );
623621

624622
return( GTK_WIDGET( find ) );
625623
}
@@ -742,7 +740,7 @@ fontchooser_init( Fontchooser *fontchooser )
742740
Fontchooser *
743741
fontchooser_new( void )
744742
{
745-
Fontchooser *fontchooser = gtk_type_new( TYPE_FONTCHOOSER );
743+
Fontchooser *fontchooser = g_object_new( TYPE_FONTCHOOSER, NULL );
746744

747745
return( fontchooser );
748746
}
@@ -945,17 +943,17 @@ infobar_destroy( GtkObject *object )
945943
IM_FREEF( g_source_remove, infobar->close_timeout );
946944
IM_FREEF( g_source_remove, infobar->close_animation_timeout );
947945

948-
GTK_OBJECT_CLASS( infobar_parent_class )->destroy( object );
946+
GTK_WIDGET_CLASS( infobar_parent_class )->destroy( object );
949947
}
950948

951949
static void
952950
infobar_class_init( InfobarClass *class )
953951
{
954-
GtkObjectClass *object_class = (GtkObjectClass *) class;
952+
GtkWidgetClass *widget_class = (GtkWidgetClass *) class;
955953

956954
infobar_parent_class = g_type_class_peek_parent( class );
957955

958-
object_class->destroy = infobar_destroy;
956+
widget_class->destroy = infobar_destroy;
959957
}
960958

961959
static void
@@ -1079,7 +1077,7 @@ infobar_new( void )
10791077

10801078
infobar = g_object_new( TYPE_INFOBAR, NULL );
10811079

1082-
vbox = gtk_vbox_new( FALSE, 10 );
1080+
vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL, 10 );
10831081
content_area = gtk_info_bar_get_content_area( GTK_INFO_BAR( infobar ) );
10841082
gtk_container_add( GTK_CONTAINER( content_area ), vbox );
10851083
gtk_widget_show( vbox );
@@ -1101,7 +1099,7 @@ infobar_new( void )
11011099
* horizontally.
11021100
*/
11031101

1104-
hbox = gtk_hbox_new( FALSE, 2 );
1102+
hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 2 );
11051103
action_area = gtk_info_bar_get_action_area( GTK_INFO_BAR( infobar ) );
11061104
gtk_container_add( GTK_CONTAINER( action_area ), hbox );
11071105
gtk_widget_show( hbox );

‎src/colourdisplay.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ colourdisplay_drag_begin( GtkWidget *widget, GdkDragContext *context )
103103
GdkColor bg;
104104

105105
window = iimageview_drag_window_new( 48, 32 );
106-
gtk_object_set_data_full( GTK_OBJECT( widget ),
106+
g_object_set_data_full( G_OBJECT( widget ),
107107
"nip2-drag-window", window,
108-
(GtkDestroyNotify) gtk_widget_destroy );
108+
(GDestroyNotify) gtk_widget_destroy );
109109
#ifdef DEBUG
110110
printf( "colourdisplay_drag_begin: generating drag swatch colour\n" );
111111
#endif /*DEBUG*/
@@ -121,7 +121,7 @@ colourdisplay_drag_begin( GtkWidget *widget, GdkDragContext *context )
121121
static void
122122
colourdisplay_drag_end( GtkWidget *widget, GdkDragContext *context )
123123
{
124-
gtk_object_set_data( GTK_OBJECT( widget ),
124+
g_object_set_data( G_OBJECT( widget ),
125125
"nip2-drag-window", NULL );
126126
}
127127

@@ -296,7 +296,7 @@ colourdisplay_init( Colourdisplay *colourdisplay )
296296
Colourdisplay *
297297
colourdisplay_new( Conversion *conv )
298298
{
299-
Colourdisplay *colourdisplay = gtk_type_new( TYPE_COLOURDISPLAY );
299+
Colourdisplay *colourdisplay = g_object_new( TYPE_COLOURDISPLAY, NULL );
300300

301301
if( !conv )
302302
conv = conversion_new( NULL );

‎src/colourview.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ colourview_init( Colourview *colourview )
120120
gtk_widget_add_events( GTK_WIDGET( eb ),
121121
GDK_POINTER_MOTION_HINT_MASK );
122122
gtk_box_pack_start( GTK_BOX( colourview ), eb, FALSE, FALSE, 0 );
123-
vbox = gtk_vbox_new( FALSE, 0 );
123+
vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL, 0 );
124124
gtk_container_add( GTK_CONTAINER( eb ), vbox );
125125
gtk_widget_show( vbox );
126126

@@ -135,8 +135,12 @@ colourview_init( Colourview *colourview )
135135
gtk_widget_show( GTK_WIDGET( colourview->colourdisplay ) );
136136

137137
colourview->label = gtk_label_new( "" );
138-
gtk_misc_set_alignment( GTK_MISC( colourview->label ), 0, 0.5 );
139-
gtk_misc_set_padding( GTK_MISC( colourview->label ), 2, 0 );
138+
gtk_widget_set_halign( GTK_WIDGET( colourview->label ),
139+
GTK_ALIGN_START );
140+
gtk_widget_set_valign( GTK_WIDGET( colourview->label ),
141+
GTK_ALIGN_CENTER );
142+
gtk_widget_set_margin_left( GTK_WIDGET( colourview->label ), 2 );
143+
gtk_widget_set_margin_right( GTK_WIDGET( colourview->label ), 2 );
140144
gtk_box_pack_start( GTK_BOX( vbox ),
141145
GTK_WIDGET( colourview->label ), FALSE, FALSE, 0 );
142146
gtk_widget_show( GTK_WIDGET( colourview->label ) );
@@ -152,7 +156,7 @@ colourview_init( Colourview *colourview )
152156
View *
153157
colourview_new( void )
154158
{
155-
Colourview *colourview = gtk_type_new( TYPE_COLOURVIEW );
159+
Colourview *colourview = g_object_new( TYPE_COLOURVIEW, NULL );
156160

157161
return( VIEW( colourview ) );
158162
}

‎src/columnview.c

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -623,15 +623,15 @@ columnview_title_event_cb( GtkWidget *widget, GdkEvent *ev, Columnview *cview )
623623
}
624624

625625
static void
626-
columnview_destroy( GtkObject *object )
626+
columnview_destroy( GtkWidget *widget )
627627
{
628628
Columnview *cview;
629629
Column *col;
630630

631-
g_return_if_fail( object != NULL );
632-
g_return_if_fail( IS_COLUMNVIEW( object ) );
631+
g_return_if_fail( widget != NULL );
632+
g_return_if_fail( IS_COLUMNVIEW( widget ) );
633633

634-
cview = COLUMNVIEW( object );
634+
cview = COLUMNVIEW( widget );
635635
col = COLUMN( VOBJECT( cview )->iobject );
636636

637637
#ifdef DEBUG
@@ -648,7 +648,7 @@ columnview_destroy( GtkObject *object )
648648
mainw_layout();
649649
}
650650

651-
GTK_OBJECT_CLASS( columnview_parent_class )->destroy( object );
651+
GTK_WIDGET_CLASS( columnview_parent_class )->destroy( widget );
652652
}
653653

654654
static void
@@ -795,7 +795,7 @@ columnview_add_text( Columnview *cview )
795795
if( cview->textfr )
796796
return;
797797

798-
cview->textfr = gtk_hbox_new( FALSE, 0 );
798+
cview->textfr = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 0 );
799799
gtk_box_pack_end( GTK_BOX( cview->vbox ),
800800
cview->textfr, FALSE, FALSE, 0 );
801801
inv = gtk_label_new( "" );
@@ -868,7 +868,6 @@ columnview_refresh( vObject *vobject )
868868
escape_markup( IOBJECT( col )->caption, buf2, 256 );
869869
im_snprintf( buf, 256, "<b>%s</b>", buf2 );
870870
gtk_label_set_markup( GTK_LABEL( label ), buf );
871-
gtk_misc_set_padding( GTK_MISC( label ), 2, 6 );
872871
}
873872

874873
/* Update names.
@@ -1005,7 +1004,6 @@ columnview_scrollto( View *view, ModelScrollPosition position )
10051004
static void
10061005
columnview_class_init( ColumnviewClass *class )
10071006
{
1008-
GtkObjectClass *object_class = (GtkObjectClass *) class;
10091007
GtkWidgetClass *widget_class = (GtkWidgetClass *) class;
10101008
vObjectClass *vobject_class = (vObjectClass *) class;
10111009
ViewClass *view_class = (ViewClass *) class;
@@ -1017,8 +1015,7 @@ columnview_class_init( ColumnviewClass *class )
10171015

10181016
/* Init methods.
10191017
*/
1020-
object_class->destroy = columnview_destroy;
1021-
1018+
widget_class->destroy = columnview_destroy;
10221019
widget_class->size_allocate = columnview_size_allocate;
10231020

10241021
vobject_class->refresh = columnview_refresh;
@@ -1094,7 +1091,7 @@ columnview_init( Columnview *cview )
10941091
cview->main = gtk_event_box_new();
10951092
gtk_widget_add_events( GTK_WIDGET( cview->main ),
10961093
GDK_BUTTON_PRESS_MASK );
1097-
cview->vbox = gtk_vbox_new( FALSE, 0 );
1094+
cview->vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL, 0 );
10981095
gtk_container_add( GTK_CONTAINER( cview->main ), cview->vbox );
10991096

11001097
/* Frame for whole title bar. Need an event_box to catch clicks.
@@ -1116,7 +1113,7 @@ columnview_init( Columnview *cview )
11161113

11171114
/* Layout contents of title bar.
11181115
*/
1119-
cview->titlehb = gtk_hbox_new( FALSE, 0 );
1116+
cview->titlehb = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 0 );
11201117
gtk_container_add( GTK_CONTAINER( frame ), cview->titlehb );
11211118

11221119
/* Up/down button.
@@ -1133,13 +1130,13 @@ columnview_init( Columnview *cview )
11331130

11341131
/* Remove columnview button.
11351132
*/
1136-
sb = gtk_vbox_new( FALSE, 0 );
1133+
sb = gtk_box_new( GTK_ORIENTATION_VERTICAL, 0 );
11371134
gtk_box_pack_end( GTK_BOX( cview->titlehb ), sb, FALSE, FALSE, 1 );
11381135
but = gtk_button_new();
11391136
gtk_button_set_relief( GTK_BUTTON( but ), GTK_RELIEF_NONE );
11401137
gtk_box_pack_start( GTK_BOX( sb ), but, TRUE, FALSE, 0 );
11411138
set_tooltip( but, _( "Delete the column" ) );
1142-
icon = gtk_image_new_from_stock( GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU );
1139+
icon = gtk_image_new_from_icon_name( GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU );
11431140
gtk_container_add( GTK_CONTAINER( but ), icon );
11441141
g_signal_connect( but, "clicked",
11451142
G_CALLBACK( columnview_destroy2_cb ), cview );
@@ -1183,7 +1180,7 @@ columnview_init( Columnview *cview )
11831180
View *
11841181
columnview_new( void )
11851182
{
1186-
Columnview *cview = gtk_type_new( TYPE_COLUMNVIEW );
1183+
Columnview *cview = g_object_new( TYPE_COLUMNVIEW, NULL );
11871184

11881185
return( VIEW( cview ) );
11891186
}

‎src/conversionview.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ conversionview_init( Conversionview *cv )
194194

195195
gtk_frame_set_shadow_type( GTK_FRAME( cv ), GTK_SHADOW_OUT );
196196

197-
hb = gtk_hbox_new( FALSE, 2 );
197+
hb = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 2 );
198198
gtk_container_set_border_width( GTK_CONTAINER( hb ), 2 );
199199
gtk_container_add( GTK_CONTAINER( cv ), hb );
200200

@@ -299,7 +299,7 @@ conversionview_link( Conversionview *cv, Imagemodel *imagemodel )
299299
Conversionview *
300300
conversionview_new( Imagemodel *imagemodel )
301301
{
302-
Conversionview *cv = gtk_type_new( TYPE_CONVERSIONVIEW );
302+
Conversionview *cv = g_object_new( TYPE_CONVERSIONVIEW, NULL );
303303

304304
conversionview_link( cv, imagemodel );
305305

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