netradiant: strip 16-bit png to 8-bit, fix #153

[xonotic/netradiant.git] / contrib / brushexport / support.cpp

diff --git a/contrib/brushexport/support.cpp b/contrib/brushexport/support.cpp
index 2835b112dad6a6f02cbd6ec3803530ca65aaac33..b2586177d969bf0bbbc97f160dab52052d4954d6 100644 (file)
--- a/contrib/brushexport/support.cpp
+++ b/contrib/brushexport/support.cpp
@@ -1,31 +1,33 @@
 #include <gtk/gtk.h>
+#include <uilib/uilib.h>
 
 #include "support.h"
 
-GtkWidget*
-lookup_widget                          (GtkWidget       *widget,
-                                        const gchar     *widget_name)
-{
-  GtkWidget *parent, *found_widget;
+ui::Widget
+lookup_widget(ui::Widget       widget,
+                          const gchar     *widget_name ){
+    ui::Widget parent{ui::null};
 
-  for (;;)
-    {
-      if (GTK_IS_MENU (widget))
-        parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
-      else
-        parent = widget->parent;
-      if (!parent)
-        parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
-      if (parent == NULL)
-        break;
-      widget = parent;
-    }
+       for (;; )
+       {
+               if ( GTK_IS_MENU( widget ) ) {
+                       parent = ui::Widget::from(gtk_menu_get_attach_widget( GTK_MENU( widget ) ));
+               }
+               else{
+                       parent = ui::Widget::from(gtk_widget_get_parent(widget));
+               }
+               if ( !parent ) {
+                       parent = ui::Widget::from(g_object_get_data( G_OBJECT( widget ), "GladeParentKey" ));
+               }
+               if ( parent == NULL ) {
+                       break;
+               }
+               widget = parent;
+       }
 
-  found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
-                                                 widget_name);
-  if (!found_widget)
-    g_warning ("Widget not found: %s", widget_name);
-  return found_widget;
+       auto found_widget = ui::Widget::from(g_object_get_data( G_OBJECT( widget ), widget_name ));
+       if ( !found_widget ) {
+               g_warning( "Widget not found: %s", widget_name );
+       }
+       return found_widget;
 }
-
-