Merge commit 'e155ebe99481333af4a7660d174db490e2a75fb5' into master-merge

[xonotic/netradiant.git] / libs / gtkutil / nonmodal.cpp

diff --git a/libs/gtkutil/nonmodal.cpp b/libs/gtkutil/nonmodal.cpp
index ef05f26e64b4ea23eddbdcf87004c0501d9b433d..f9da2dbf40b98738d6c50a89114b1c346b7efd7f 100644 (file)
--- a/libs/gtkutil/nonmodal.cpp
+++ b/libs/gtkutil/nonmodal.cpp
@@ -6,7 +6,7 @@
 gboolean escape_clear_focus_widget(ui::Widget widget, GdkEventKey *event, gpointer data)
 {
     if (event->keyval == GDK_KEY_Escape) {
-        gtk_window_set_focus(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(widget))), NULL);
+        gtk_window_set_focus(widget.window(), NULL);
         return TRUE;
     }
     return FALSE;
@@ -25,7 +25,7 @@ gboolean NonModalEntry::focus_in(ui::Entry entry, GdkEventFocus *event, NonModal
 
 gboolean NonModalEntry::focus_out(ui::Entry entry, GdkEventFocus *event, NonModalEntry *self)
 {
-    if (self->m_editing && gtk_widget_get_visible(GTK_WIDGET(entry))) {
+    if (self->m_editing && gtk_widget_get_visible(entry)) {
         self->m_apply();
     }
     self->m_editing = false;
@@ -40,10 +40,10 @@ gboolean NonModalEntry::changed(ui::Entry entry, NonModalEntry *self)
 
 gboolean NonModalEntry::enter(ui::Entry entry, GdkEventKey *event, NonModalEntry *self)
 {
-    if (event->keyval == GDK_Return) {
+    if (event->keyval == GDK_KEY_Return) {
         self->m_apply();
         self->m_editing = false;
-        gtk_window_set_focus(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(entry))), NULL);
+        gtk_window_set_focus(entry.window(), NULL);
         return TRUE;
     }
     return FALSE;
@@ -51,10 +51,10 @@ gboolean NonModalEntry::enter(ui::Entry entry, GdkEventKey *event, NonModalEntry
 
 gboolean NonModalEntry::escape(ui::Entry entry, GdkEventKey *event, NonModalEntry *self)
 {
-    if (event->keyval == GDK_Escape) {
+    if (event->keyval == GDK_KEY_Escape) {
         self->m_cancel();
         self->m_editing = false;
-        gtk_window_set_focus(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(entry))), NULL);
+        gtk_window_set_focus(entry.window(), NULL);
         return TRUE;
     }
     return FALSE;
@@ -77,8 +77,8 @@ gboolean NonModalSpinner::changed(ui::SpinButton spin, NonModalSpinner *self)
 
 gboolean NonModalSpinner::enter(ui::SpinButton spin, GdkEventKey *event, NonModalSpinner *self)
 {
-    if (event->keyval == GDK_Return) {
-        gtk_window_set_focus(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(spin))), NULL);
+    if (event->keyval == GDK_KEY_Return) {
+        gtk_window_set_focus(spin.window(), NULL);
         return TRUE;
     }
     return FALSE;
@@ -86,9 +86,9 @@ gboolean NonModalSpinner::enter(ui::SpinButton spin, GdkEventKey *event, NonModa
 
 gboolean NonModalSpinner::escape(ui::SpinButton spin, GdkEventKey *event, NonModalSpinner *self)
 {
-    if (event->keyval == GDK_Escape) {
+    if (event->keyval == GDK_KEY_Escape) {
         self->m_cancel();
-        gtk_window_set_focus(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(spin))), NULL);
+        gtk_window_set_focus(spin.window(), NULL);
         return TRUE;
     }
     return FALSE;
@@ -96,7 +96,7 @@ gboolean NonModalSpinner::escape(ui::SpinButton spin, GdkEventKey *event, NonMod
 
 void NonModalSpinner::connect(ui::SpinButton spin)
 {
-    auto adj = ui::Adjustment(gtk_spin_button_get_adjustment(spin));
+    auto adj = ui::Adjustment::from(gtk_spin_button_get_adjustment(spin));
     guint handler = adj.connect("value_changed", G_CALLBACK(changed), this);
     g_object_set_data(G_OBJECT(spin), "handler", gint_to_pointer(handler));
     spin.connect("key_press_event", G_CALLBACK(enter), this);
@@ -107,6 +107,6 @@ void NonModalRadio::connect(ui::RadioButton radio)
 {
     GSList *group = gtk_radio_button_get_group(radio);
     for (; group != 0; group = g_slist_next(group)) {
-        toggle_button_connect_callback(ui::ToggleButton(GTK_TOGGLE_BUTTON(group->data)), m_changed);
+        toggle_button_connect_callback(ui::ToggleButton::from(group->data), m_changed);
     }
 }