marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mape: Port to GTK+ 3.0

scancodes-fix
Günther Brammer 2013-01-09 02:06:48 +01:00 committed by Armin Burgmeier
parent 3833416629
commit 36e966ba26
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mape/diskview.c
View File

@ -523,7 +523,7 @@ static gboolean mape_disk_view_cb_key_press_event(GtkWidget* widget,
disk_view = (MapeDiskView*)user_data;
if(event->keyval != GDK_Left && event->keyval != GDK_Right)
if(event->keyval != GDK_KEY_Left && event->keyval != GDK_KEY_Right)
return FALSE;
gtk_tree_view_get_cursor(
@ -536,7 +536,7 @@ static gboolean mape_disk_view_cb_key_press_event(GtkWidget* widget,
switch(event->keyval)
{
case GDK_Left:
case GDK_KEY_Left:
result = gtk_tree_view_row_expanded(
GTK_TREE_VIEW(disk_view->view),
path
@ -566,7 +566,7 @@ static gboolean mape_disk_view_cb_key_press_event(GtkWidget* widget,
}
break;
case GDK_Right:
case GDK_KEY_Right:
result = gtk_tree_view_row_expanded(
GTK_TREE_VIEW(disk_view->view),
path

4
src/mape/iconview.c
View File

@ -34,7 +34,11 @@ MapeIconView* mape_icon_view_new(GError** error)
view->view = gtk_icon_view_new_with_model(view->list_store);
g_object_unref(view->list_store);
#if GTK_CHECK_VERSION(2,22,0)
gtk_icon_view_set_item_orientation(
#else
gtk_icon_view_set_orientation(
#endif
GTK_ICON_VIEW(view->view),
GTK_ORIENTATION_HORIZONTAL
);

33
src/mape/preferencesdialog.c
View File

@ -269,9 +269,10 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
GTK_RESPONSE_OK,
NULL
);
GtkBox * content_area = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog->dialog)));
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->hbox_tab_width,
FALSE,
TRUE,
@ -279,7 +280,7 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->hbox_map_width,
FALSE,
TRUE,
@ -287,7 +288,7 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->hbox_map_height,
FALSE,
TRUE,
@ -295,7 +296,7 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->cbx_tab_to_spaces,
FALSE,
TRUE,
@ -303,7 +304,7 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->cbx_auto_indentation,
FALSE,
TRUE,
@ -311,7 +312,7 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->cbx_text_wrapping,
FALSE,
TRUE,
@ -319,7 +320,7 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->cbx_line_numbers,
FALSE,
TRUE,
@ -327,7 +328,7 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->cbx_highlight_line,
FALSE,
TRUE,
@ -335,23 +336,23 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->cbx_bracket_matching,
FALSE,
TRUE,
0
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->cbx_fixed_seed,
FALSE,
TRUE,
0
);
gtk_box_pack_start(
GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
dialog->hbox_random_seed,
FALSE,
TRUE,
@ -359,11 +360,11 @@ MapePreferencesDialog* mape_preferences_dialog_new(GtkWindow* parent,
);
gtk_container_set_border_width(
GTK_CONTAINER(GTK_DIALOG(dialog->dialog)->vbox),
content_area,
10
);
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog->dialog)->vbox), 5);
gtk_box_set_spacing(content_area, 5);
gtk_window_set_transient_for(GTK_WINDOW(dialog->dialog), parent);
gtk_window_set_resizable(GTK_WINDOW(dialog->dialog), FALSE);