fixed warnings

[xonotic/netradiant.git] / contrib / bobtoolz / dialogs / dialogs-gtk.cpp

diff --git a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
index 0058ea7aef9de1e210cdf26d210f9b878302bf33..15d9db672723959f35c38937bcb2677d6992dcb5 100644 (file)
--- a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
+++ b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp
@@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "str.h"
 #include <list>
 
 #include "str.h"
 #include <list>

+#include <gtk/gtk.h>
+#include "gtkutil/pointer.h"

 
 #include "../lists.h"
 #include "../misc.h"
 
 #include "../lists.h"
 #include "../misc.h"


@@ -89,7 +91,7 @@ static void dialog_button_callback (GtkWidget *widget, gpointer data)
        ret = (EMessageBoxReturn*)g_object_get_data (G_OBJECT (parent), "ret");
  
        *loop = 0;
        ret = (EMessageBoxReturn*)g_object_get_data (G_OBJECT (parent), "ret");
  
        *loop = 0;

-       *ret = (EMessageBoxReturn)GPOINTER_TO_INT(data);
+       *ret = (EMessageBoxReturn)gpointer_to_int(data);

 }
  
 static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)
 }
  
 static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)


@@ -1349,12 +1351,8 @@ EMessageBoxReturn DoResetTextureBox (ResetTextureRS* rs)
        
        // ---- hbox ----
 
        
        // ---- hbox ----
 

-       texSelected = "Currently Selected Face:   ";
-#if 0
-       if(g_SelectedFaceTable.m_pfnGetSelectedFaceCount() == 1) {
-               texSelected += GetCurrentTexture();
-       }
-#endif
+       texSelected = "Currently Selected Texture:   ";
+  texSelected += GetCurrentTexture();

 
        w = gtk_label_new (texSelected);
        gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 2);
 
        w = gtk_label_new (texSelected);
        gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 2);