summary refs log tree commit diff stats
path: root/src/fe-gtk/fkeys.c
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2013-05-12 01:43:27 -0400
committerTingPing <tingping@tingping.se>2013-09-20 17:24:39 -0400
commitae04663aa91f864250fd109fe6433c8dea7c4a93 (patch)
treed02b14b3ef494c0f82fcf17ce8c8b4fffe9bcf3c /src/fe-gtk/fkeys.c
parent9f8073ab7705e0b5d9b83cb046741bd5c5f78f05 (diff)
First round of using GTK accessor functions
This is the first step to build with GSEAL_ENABLE
setup.c uses a deprecated fontchooser,
chanview-tabs.c didn't like the conversion, and
I am waiting to do some work on xtext.c before
converting it.
Diffstat (limited to 'src/fe-gtk/fkeys.c')
-rw-r--r--src/fe-gtk/fkeys.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c
index 4be2082e..146804d0 100644
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@@ -569,7 +569,7 @@ key_dialog_sel_row (GtkWidget * clist, gint row, gint column,
 static void
 key_dialog_tog_key (GtkWidget * tog, int kstate)
 {
-	int state = GTK_TOGGLE_BUTTON (tog)->active;
+	int state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tog));
 	int row = gtkutil_clist_selection (key_dialog_kb_clist);
 	struct key_binding *kb;
 	char buf[32];
@@ -1303,8 +1303,8 @@ key_action_scroll_page (GtkWidget * wid, GdkEventKey * evt, char *d1,
 	if (!sess)
 		return 0;
 
-	adj = GTK_RANGE (sess->gui->vscrollbar)->adjustment;
-	end = adj->upper - adj->lower - adj->page_size;
+	adj = gtk_range_get_adjustment (GTK_RANGE (sess->gui->vscrollbar));
+	end = gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj) - gtk_adjustment_get_page_size (adj);
 
 	switch (type)
 	{
@@ -1317,19 +1317,19 @@ key_action_scroll_page (GtkWidget * wid, GdkEventKey * evt, char *d1,
 		break;
 
 	case PAGE_UP:
-		value = adj->value - (adj->page_size - 1);
+		value = gtk_adjustment_get_value (adj) - (gtk_adjustment_get_page_size (adj) - 1);
 		break;
 
 	case PAGE_DOWN:
-		value = adj->value + (adj->page_size - 1);
+		value = gtk_adjustment_get_value (adj) + (gtk_adjustment_get_page_size (adj) - 1);
 		break;
 
 	case LINE_UP:
-		value = adj->value - 1.0;
+		value = gtk_adjustment_get_value (adj) - 1.0;
 		break;
 
 	case LINE_DOWN:
-		value = adj->value + 1.0;
+		value = gtk_adjustment_get_value (adj) + 1.0;
 		break;
 	}