X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=contrib%2Fbobtoolz%2Fdialogs%2Fdialogs-gtk.cpp;h=15d9db672723959f35c38937bcb2677d6992dcb5;hp=0058ea7aef9de1e210cdf26d210f9b878302bf33;hb=0f319946a6e6fbddc51888c150f8be46bc4b142c;hpb=6ee91d153ea09f2dafa62ed2f022f4183c090168;ds=sidebyside diff --git a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp index 0058ea7a..15d9db67 100644 --- 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 +#include +#include "gtkutil/pointer.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)GPOINTER_TO_INT(data); + *ret = (EMessageBoxReturn)gpointer_to_int(data); } static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data) @@ -1349,12 +1351,8 @@ EMessageBoxReturn DoResetTextureBox (ResetTextureRS* rs) // ---- 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);