64bit compile fixes

git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@106 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/contrib/camera/dialogs_common.cpp b/contrib/camera/dialogs_common.cpp
index 62019b0a157278903ee7e2516d7370300af33a09..43a4e70eab79a692677e3f0558ce4493b318c9df 100644 (file)
--- a/contrib/camera/dialogs_common.cpp
+++ b/contrib/camera/dialogs_common.cpp
@@ -36,7 +36,7 @@ void dialog_button_callback (GtkWidget *widget, gpointer data)
        ret = (int*)g_object_get_data (G_OBJECT (parent), "ret");
  
        *loop = 0;
-       *ret = (int)data;
+       *ret = gpointer_to_int (data);
 }
 
 gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)

diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp
index 2298db60bed79410104a82b73bf1b5f0cf8d11fb..abc57fc344f8ba0167f4222aab9a1b690fa5e64a 100644 (file)
--- a/contrib/hydratoolz/plugin.cpp
+++ b/contrib/hydratoolz/plugin.cpp
@@ -68,7 +68,7 @@ static void dialog_button_callback (GtkWidget *widget, gpointer data)
   ret = (int*)gtk_object_get_data (GTK_OBJECT (parent), "ret");
 
   *loop = 0;
-  *ret = (int)data;
+  *ret = gpointer_to_int (data);
 }
 
 static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)

diff --git a/contrib/prtview/AboutDialog.cpp b/contrib/prtview/AboutDialog.cpp
index bd85103a9240bcb70231d3cef17692af52a04096..1c6b735f5dd32c618e52d2cd20a41ef9c129ed7e 100644 (file)
--- a/contrib/prtview/AboutDialog.cpp
+++ b/contrib/prtview/AboutDialog.cpp
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "AboutDialog.h"
 #include <gtk/gtk.h>
+#include <gtkutil/pointer.h>
 #include "version.h"
 #include "gtkutil/pointer.h"
 

diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp
index 87f6d39b3f656e7119e7e6734cab0fa3ca8d88d5..d9984a0b8a7b66f935feedc5f67247a643855f95 100644 (file)
--- a/contrib/prtview/LoadPortalFileDialog.cpp
+++ b/contrib/prtview/LoadPortalFileDialog.cpp
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "LoadPortalFileDialog.h"
 
 #include <gtk/gtk.h>
+#include <gtkutil/pointer.h>
 #include "stream/stringstream.h"
 #include "convert.h"
 #include "gtkutil/pointer.h"

diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp
index 9a95e3e4f945256975ed8945954e447ad5e6c62e..9ba7b01bffd66abe8f7eaf8d0939f9b88ff884ed 100644 (file)
--- a/plugins/textool/TexTool.cpp
+++ b/plugins/textool/TexTool.cpp
@@ -38,7 +38,7 @@ static void dialog_button_callback (GtkWidget *widget, gpointer data)
   ret = (int*)g_object_get_data (G_OBJECT (parent), "ret");
  
   *loop = 0;
-  *ret = (int)data;
+  *ret = gpointer_to_int (data);
 }
  
 static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)

diff --git a/radiant/eclass_doom3.cpp b/radiant/eclass_doom3.cpp
index a1ce4bdea68d7881f6e85c5ca7f1217da633388a..b172a36a7dd18a93414d17640c1b026d83afbbd9 100644 (file)
--- a/radiant/eclass_doom3.cpp
+++ b/radiant/eclass_doom3.cpp
@@ -668,7 +668,7 @@ bool EntityClassDoom3_parse(TextInputStream& inputStream, const char* filename)
     CopiedString tmp(blockType);
     if(!EntityClassDoom3_parseBlock(tokeniser, tmp.c_str()))
     {
-      globalErrorStream() << GlobalFileSystem().findFile(filename) << filename << ":" << tokeniser.getLine() << ": " << tmp.c_str() << " parse failed, skipping rest of file\n";
+      globalErrorStream() << GlobalFileSystem().findFile(filename) << filename << ":" << (unsigned int)tokeniser.getLine() << ": " << tmp.c_str() << " parse failed, skipping rest of file\n";
       return false;
     }
   }