summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorleo2009-10-08 00:08:32 +0000
committerleo2009-10-08 00:08:32 +0000
commit9a0e93203b563299728cc41e6c455792bfe4c5af (patch)
tree4e95a0446d0aca601e2d4d2eb0e5721f595d1c5e /linux
parent27924be9739e67cb7808dfa98c4904816bed1cea (diff)
Fixes for 64-bit systems.
git-svn-id: http://svn.leocad.org/branches/leocad-0.75@836 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'linux')
-rw-r--r--linux/dialogs.cpp2
-rwxr-xr-xlinux/dlgpiece.cpp2
-rw-r--r--linux/main.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/linux/dialogs.cpp b/linux/dialogs.cpp
index 5318caf..de0b3ef 100644
--- a/linux/dialogs.cpp
+++ b/linux/dialogs.cpp
@@ -219,7 +219,7 @@ int dlg_domodal(GtkWidget* dlg, int def)
void dlg_default_callback(GtkWidget *widget, gpointer data)
{
- *cur_ret = (int)data;
+ *cur_ret = GPOINTER_TO_INT(data);
}
gint dlg_delete_callback(GtkWidget *widget, GdkEvent* event, gpointer data)
diff --git a/linux/dlgpiece.cpp b/linux/dlgpiece.cpp
index 36f06a4..ac260c6 100755
--- a/linux/dlgpiece.cpp
+++ b/linux/dlgpiece.cpp
@@ -64,7 +64,7 @@ static void minifigdlg_color_response (GtkWidget *widget, gpointer data)
info->wizard->ChangeColor (i, GPOINTER_TO_INT (data));
info->wizard->Redraw ();
- set_button_pixmap2 (button, FlatColorArray[(int)data]);
+ set_button_pixmap2 (button, FlatColorArray[GPOINTER_TO_INT(data)]);
}
// A color button was clicked
diff --git a/linux/main.cpp b/linux/main.cpp
index 2e482bc..7720d92 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -128,7 +128,7 @@ void OnCommandDirect(GtkWidget *w, gpointer data)
if (ignore_commands)
return;
- lcGetActiveProject()->HandleCommand((LC_COMMANDS)(int)data, 0);
+ lcGetActiveProject()->HandleCommand((LC_COMMANDS)GPOINTER_TO_INT(data), 0);
}
static void view_destroy (GtkWidget *widget, gpointer data)
@@ -139,7 +139,7 @@ static void view_destroy (GtkWidget *widget, gpointer data)
void OnCommand(GtkWidget* widget, gpointer data)
{
Project* project = lcGetActiveProject();
- int id = (int)data;
+ int id = GPOINTER_TO_INT(data);
if (ignore_commands)
return;