diff options
Diffstat (limited to 'gui/MemcardDlg.c')
| -rw-r--r-- | gui/MemcardDlg.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c index bfe96125..137fe907 100644 --- a/gui/MemcardDlg.c +++ b/gui/MemcardDlg.c @@ -28,6 +28,7 @@ #include "Linux.h" #include "../libpcsxcore/sio.h" +#include "MemcardDlg.h" #if GTK_CHECK_VERSION(2, 20, 0) && !GTK_CHECK_VERSION(3, 0, 0) #include "gdk-compat.h" @@ -328,7 +329,7 @@ static void UpdateListItems(int mcd, GtkWidget *widget) { gtk_widget_show(List); - OnTreeSelectionChanged(gtk_tree_view_get_selection(GTK_TREE_VIEW(List)), (gpointer)mcd); + OnTreeSelectionChanged(gtk_tree_view_get_selection(GTK_TREE_VIEW(List)), (gpointer)(long)mcd); } static void UpdateMcdDlg(GtkWidget *widget) { @@ -352,7 +353,7 @@ static void OnMcd_Close(GtkDialog *dialog, gint arg1, gpointer user_data) { } static void OnMcd_FileChange(GtkWidget *widget, gpointer user_data) { - gint memcard = (int)user_data; + gint memcard = (int)(long)user_data; gchar *filename; GtkWidget *chooser; @@ -394,7 +395,7 @@ static void OnMcd_Format(GtkWidget *widget, gpointer user_data) { gint result; char *str; - gint memcard = (int)user_data; + gint memcard = (int)(long)user_data; message_dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, @@ -447,10 +448,10 @@ static void OnMcd_New(GtkWidget *widget, gpointer user_data) { CreateMcd(name); - if ((int)user_data == 1) strncpy(Config.Mcd1, name, MAXPATHLEN); + if ((int)(long)user_data == 1) strncpy(Config.Mcd1, name, MAXPATHLEN); else strncpy(Config.Mcd2, name, MAXPATHLEN); - LoadMcd((int)user_data, name); + LoadMcd((int)(long)user_data, name); LoadMcdDlg(widget); g_free(name); @@ -504,7 +505,7 @@ static void CopyMemcardData(char *from, char *to, gint *i, gchar *str) { } static void OnMcd_CopyTo(GtkWidget *widget, gpointer user_data) { - gint mcd = (gint)user_data; + gint mcd = (gint)(long)user_data; GtkTreeIter iter; GtkTreeModel *model; @@ -571,7 +572,7 @@ static void OnMemcardDelete(GtkWidget *widget, gpointer user_data) { GtkWidget *tree; GtkTreeSelection *sel; - gint memcard = (int)user_data; + gint memcard = (int)(long)user_data; xml = glade_get_widget_tree(widget); @@ -624,7 +625,7 @@ static void OnTreeSelectionChanged(GtkTreeSelection *selection, gpointer user_da int i; McdBlock b; - gint memcard = (int)user_data; + gint memcard = (int)(long)user_data; xml = glade_get_widget_tree(GtkCList_McdList1); selected = gtk_tree_selection_get_selected(selection, &model, &iter); @@ -676,7 +677,7 @@ static void OnTreeSelectionChanged(GtkTreeSelection *selection, gpointer user_da } } -gboolean updateFunc(gpointer data) { +static gboolean updateFunc(gpointer data) { if (quit) return FALSE; currentIcon++; UpdateListItems(1, GtkCList_McdList1); |