mirror of
https://github.com/UberGames/GtkRadiant.git
synced 2024-11-10 14:41:54 +00:00
64bit compile fixes
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@106 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
parent
896d2a255a
commit
53bb8dbf01
6 changed files with 6 additions and 4 deletions
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue