← Back to branch summary

~cairo-dock-team/cairo-desklet/trunk

« back to all changes in this revision

Viewing changes to src/cairo-desklet-gui-simple.c

  • Committer: Matthieu Baerts
  • Date: 2014-07-14 21:19:06 UTC
  • Revision ID: matttbe@gmail.com-20140714211906-o1g88wgvq74wznrd
GTK: Removed GTK2 support

It's time to remove its support because GTK3 is now supported by all major stable distributions and the development version was no enough tested with GTK 2.

PS: fixed a few GTK 3 warnings/deprecations

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cairo-desklet-gui-simple.c
266
266
        if (cTitle != NULL)
267
267
                gtk_window_set_title (GTK_WINDOW (pMainWindow), cTitle);
268
268
 
269
 
        GtkWidget *pMainVBox = _gtk_vbox_new (CAIRO_DOCK_FRAME_MARGIN);
 
269
        GtkWidget *pMainVBox = gtk_box_new (GTK_ORIENTATION_VERTICAL, CAIRO_DOCK_FRAME_MARGIN);
270
270
        gtk_container_add (GTK_CONTAINER (pMainWindow), pMainVBox);
271
271
        
272
272
        //\_____________ On ajoute les boutons.
273
 
        GtkWidget *pButtonsHBox = _gtk_hbox_new (CAIRO_DOCK_FRAME_MARGIN*2);
 
273
        GtkWidget *pButtonsHBox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, CAIRO_DOCK_FRAME_MARGIN*2);
274
274
        gtk_box_pack_end (GTK_BOX (pMainVBox),
275
275
                pButtonsHBox,
276
276
                FALSE,
277
277
                FALSE,
278
278
                0);
279
279
        
280
 
        GtkWidget *pQuitButton = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
 
280
        GtkWidget *pQuitButton = gtk_button_new_with_label (_("Close"));
281
281
        g_signal_connect (G_OBJECT (pQuitButton), "clicked", G_CALLBACK(on_click_generic_quit), pMainWindow);
282
282
        gtk_box_pack_end (GTK_BOX (pButtonsHBox),
283
283
                pQuitButton,
287
287
        
288
288
        if (pAction != NULL)
289
289
        {
290
 
                GtkWidget *pApplyButton = gtk_button_new_from_stock (GTK_STOCK_APPLY);
 
290
                GtkWidget *pApplyButton = gtk_button_new_with_label (_("Apply"));
291
291
                g_signal_connect (G_OBJECT (pApplyButton), "clicked", G_CALLBACK(on_click_generic_apply), pMainWindow);
292
292
                gtk_box_pack_end (GTK_BOX (pButtonsHBox),
293
293
                        pApplyButton,
297
297
        }
298
298
        else
299
299
        {
300
 
                GtkWidget *pApplyButton = gtk_button_new_from_stock (GTK_STOCK_OK);
 
300
                GtkWidget *pApplyButton = gtk_button_new_with_label (_("OK"));
301
301
                g_signal_connect (G_OBJECT (pApplyButton), "clicked", G_CALLBACK(on_click_generic_ok), pMainWindow);
302
302
                gtk_box_pack_end (GTK_BOX (pButtonsHBox),
303
303
                        pApplyButton,
306
306
                        0);
307
307
        }
308
308
        
309
 
        //\_____________ On ajoute la barre d'etat a la fin.
 
309
        //\_____________ We add a status bar at the end.
310
310
        GtkWidget *pStatusBar = gtk_statusbar_new ();
311
 
        #if (GTK_MAJOR_VERSION < 3)
312
 
        gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (pStatusBar), FALSE);  // removed in GTK3 (gtk_window_set_has_resize_grip)
313
 
        #endif
314
311
        gtk_box_pack_start (GTK_BOX (pButtonsHBox),  // pMainVBox
315
312
                pStatusBar,
316
313
                FALSE,