From 935ca155169374622354a27265c33320d5d02526 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 28 Apr 2012 12:17:59 +0100 Subject: Drop GtkObject use in dialog-events (bzr r11302) --- src/dialogs/dialog-events.cpp | 4 ++-- src/dialogs/dialog-events.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index 70899d4d7..e9df0b5e1 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -315,7 +315,7 @@ void on_dialog_unhide (GtkWidget *w) } gboolean -sp_dialog_hide (GtkObject */*object*/, gpointer data) +sp_dialog_hide(GObject * /*object*/, gpointer data) { GtkWidget *dlg = (GtkWidget *) data; @@ -328,7 +328,7 @@ sp_dialog_hide (GtkObject */*object*/, gpointer data) gboolean -sp_dialog_unhide (GtkObject */*object*/, gpointer data) +sp_dialog_unhide(GObject * /*object*/, gpointer data) { GtkWidget *dlg = (GtkWidget *) data; diff --git a/src/dialogs/dialog-events.h b/src/dialogs/dialog-events.h index 50c3eaabb..5ba2d62c9 100644 --- a/src/dialogs/dialog-events.h +++ b/src/dialogs/dialog-events.h @@ -61,8 +61,8 @@ void sp_transientize_callback ( Inkscape::Application *inkscape, void on_dialog_hide (GtkWidget *w); void on_dialog_unhide (GtkWidget *w); -gboolean sp_dialog_hide (GtkObject *object, gpointer data); -gboolean sp_dialog_unhide (GtkObject *object, gpointer data); +gboolean sp_dialog_hide (GObject *object, gpointer data); +gboolean sp_dialog_unhide (GObject *object, gpointer data); #endif -- cgit v1.2.3 From 7a38f66b0aefb8da58dd26ec51e4de53e8d1cf95 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 1 May 2012 00:08:33 +0100 Subject: Fix typos in Gtk3 fixes, and fix separator API usage (bzr r11309) --- src/dialogs/find.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp index 3bd22b8eb..8653e42ae 100644 --- a/src/dialogs/find.cpp +++ b/src/dialogs/find.cpp @@ -555,7 +555,7 @@ sp_find_types () { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); - gtk_box_new(GTK_BOX(vb), FALSE); + gtk_box_set_homogeneous(GTK_BOX(vb), FALSE); #else GtkWidget *vb = gtk_vbox_new (FALSE, 4); #endif @@ -587,7 +587,7 @@ sp_find_types () { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *vb_all = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_new(GTK_BOX(vb_all), FALSE); + gtk_box_set_homogeneous(GTK_BOX(vb_all), FALSE); #else GtkWidget *vb_all = gtk_vbox_new (FALSE, 0); #endif @@ -735,7 +735,7 @@ sp_find_dialog_old (void) /* Toplevel vbox */ #if GTK_CHECK_VERSION(3,0,0) GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_new(GTK_BOX(vb), FALSE); + gtk_box_set_homogeneous(GTK_BOX(vb), FALSE); #else GtkWidget *vb = gtk_vbox_new (FALSE, 0); #endif @@ -753,7 +753,11 @@ sp_find_dialog_old (void) gtk_box_pack_start (GTK_BOX (vb), types, FALSE, FALSE, 0); { +#if GTK_CHECK_VERSION(3,0,0) + GtkWidget *w = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); +#else GtkWidget *w = gtk_hseparator_new (); +#endif gtk_widget_show (w); gtk_box_pack_start (GTK_BOX (vb), w, FALSE, FALSE, 3); -- cgit v1.2.3 From e88902b8cd0e5c84c1d6be060dc692f30ab3d20b Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 2 May 2012 22:40:07 -0700 Subject: Eliminated duplication of GTK key defines. (bzr r11318) --- src/dialogs/dialog-events.cpp | 97 +------------------------------------------ 1 file changed, 1 insertion(+), 96 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index e9df0b5e1..fe897974c 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -28,102 +28,7 @@ #include "dialog-events.h" #if !GTK_CHECK_VERSION(2,22,0) -#define GDK_KEY_VoidSymbol 0xffffff -#define GDK_KEY_Up 0xff52 -#define GDK_KEY_KP_Up 0xff97 -#define GDK_KEY_Down 0xff54 -#define GDK_KEY_KP_Down 0xff99 -#define GDK_KEY_Left 0xff51 -#define GDK_KEY_KP_Left 0xff96 -#define GDK_KEY_Right 0xff53 -#define GDK_KEY_KP_Right 0xff98 -#define GDK_KEY_Page_Up 0xff55 -#define GDK_KEY_KP_Page_Up 0xff9a -#define GDK_KEY_Page_Down 0xff56 -#define GDK_KEY_KP_Page_Down 0xff9b -#define GDK_KEY_Home 0xff50 -#define GDK_KEY_KP_Home 0xff95 -#define GDK_KEY_End 0xff57 -#define GDK_KEY_KP_End 0xff9c -#define GDK_KEY_a 0x061 -#define GDK_KEY_A 0x041 -#define GDK_KEY_b 0x062 -#define GDK_KEY_B 0x042 -#define GDK_KEY_d 0x064 -#define GDK_KEY_D 0x044 -#define GDK_KEY_g 0x067 -#define GDK_KEY_G 0x047 -#define GDK_KEY_i 0x069 -#define GDK_KEY_I 0x049 -#define GDK_KEY_j 0x06a -#define GDK_KEY_J 0x04a -#define GDK_KEY_k 0x06b -#define GDK_KEY_K 0x04b -#define GDK_KEY_l 0x06c -#define GDK_KEY_L 0x04c -#define GDK_KEY_q 0x071 -#define GDK_KEY_Q 0x051 -#define GDK_KEY_r 0x072 -#define GDK_KEY_R 0x052 -#define GDK_KEY_s 0x073 -#define GDK_KEY_S 0x053 -#define GDK_KEY_u 0x075 -#define GDK_KEY_U 0x055 -#define GDK_KEY_w 0x077 -#define GDK_KEY_W 0x057 -#define GDK_KEY_x 0x078 -#define GDK_KEY_X 0x058 -#define GDK_KEY_z 0x07a -#define GDK_KEY_Z 0x05a -#define GDK_KEY_Escape 0xff1b -#define GDK_KEY_Control_L 0xffe3 -#define GDK_KEY_Control_R 0xffe4 -#define GDK_KEY_Alt_L 0xffe9 -#define GDK_KEY_Alt_R 0xffea -#define GDK_KEY_Shift_L 0xffe1 -#define GDK_KEY_Shift_R 0xffe2 -#define GDK_KEY_Meta_L 0xffe7 -#define GDK_KEY_Meta_R 0xffe8 -#define GDK_KEY_KP_0 0xffb0 -#define GDK_KEY_KP_1 0xffb1 -#define GDK_KEY_KP_2 0xffb2 -#define GDK_KEY_KP_3 0xffb3 -#define GDK_KEY_KP_4 0xffb4 -#define GDK_KEY_KP_5 0xffb5 -#define GDK_KEY_KP_6 0xffb6 -#define GDK_KEY_KP_7 0xffb7 -#define GDK_KEY_KP_8 0xffb8 -#define GDK_KEY_KP_9 0xffb9 -#define GDK_KEY_F1 0xffbe -#define GDK_KEY_F2 0xffbf -#define GDK_KEY_F3 0xffc0 -#define GDK_KEY_F4 0xffc1 -#define GDK_KEY_F5 0xffc2 -#define GDK_KEY_F6 0xffc3 -#define GDK_KEY_F7 0xffc4 -#define GDK_KEY_F8 0xffc5 -#define GDK_KEY_F9 0xffc6 -#define GDK_KEY_F10 0xffc7 -#define GDK_KEY_F11 0xffc8 -#define GDK_KEY_Insert 0xff63 -#define GDK_KEY_KP_Insert 0xff9e -#define GDK_KEY_Delete 0xffff -#define GDK_KEY_KP_Delete 0xff9f -#define GDK_KEY_BackSpace 0xff08 -#define GDK_KEY_Return 0xff0d -#define GDK_KEY_KP_Enter 0xff8d -#define GDK_KEY_space 0x020 -#define GDK_KEY_KP_Space 0xff80 -#define GDK_KEY_Tab 0xff09 -#define GDK_KEY_ISO_Left_Tab 0xfe20 -#define GDK_KEY_bracketleft 0x05b -#define GDK_KEY_bracketright 0x05d -#define GDK_KEY_less 0x03c -#define GDK_KEY_greater 0x03e -#define GDK_KEY_comma 0x02c -#define GDK_KEY_period 0x02e -#define GDK_KEY_KP_Add 0xffab -#define GDK_KEY_KP_Subtract 0xffad +#include "compat-key-syms.h" #endif -- cgit v1.2.3