X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Ffilemenu.c;h=560f4d9b18fa3ade561429372ca82590f68ba94f;hb=a689c767988e598344ba249cde5709c4b24f3e00;hp=bb7489ccd4c96c7653062d9fdf58287c5467e193;hpb=b23541495010180e3a69e3e1f64c934b28775878;p=emu8051.git

diff --git a/src/filemenu.c b/src/filemenu.c
index bb7489c..560f4d9 100644
--- a/src/filemenu.c
+++ b/src/filemenu.c
@@ -34,64 +34,44 @@
 
 #define FILENAME_DESCRIPTION "Open Intel Hex file"
 
-static void
-FileOpenDialog_OK(GtkWidget *widget, gpointer file_dialog)
+void
+FileOpenEvent(GtkObject *object, gpointer data)
 {
-	char *selected_file;
+	GtkWidget *file_dialog;
+	char *cwd;
 
 #if defined(DEBUG)
-	g_print("FileOpenDialog_OK()\n");
+	g_print("FileOpenEvent()\n");
 #endif
 
-	/*
-	 * The cast to (char *) is to remove a warning in GTK2, because the
-	 * return value of the gtk_file_selection_get_filename() function is
-	 * 'G_CONST_RETURN gchar *'.
-	 */
-	selected_file = (char *) gtk_file_selection_get_filename(
-		GTK_FILE_SELECTION(file_dialog));
+	/* Create a new file selection widget. */
+	file_dialog = gtk_file_chooser_dialog_new(
+		FILENAME_DESCRIPTION, NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
 
-	g_print("emugtk_File = %s\n", selected_file);
+	/* Opening file chooser to current working directory. */
+	cwd = g_get_current_dir();
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_dialog), cwd);
+	g_free (cwd);
 
-	emugtk_new_file(selected_file);
+	if (gtk_dialog_run(GTK_DIALOG(file_dialog)) == GTK_RESPONSE_ACCEPT) {
+		char *selected_file;
 
-	gtk_widget_destroy(GTK_WIDGET(file_dialog));
-}
-
-void
-FileOpenEvent(GtkObject *object, gpointer data)
-{
-	GtkWidget *file_dialog;
+		selected_file = gtk_file_chooser_get_filename(
+			GTK_FILE_CHOOSER(file_dialog));
 
+		if (selected_file != NULL) {
 #if defined(DEBUG)
-	g_print("FileOpenEvent()\n");
+			g_print("emugtk_File = %s\n", selected_file);
 #endif
 
-	/* Create a new file selection widget. */
-	file_dialog = gtk_file_selection_new(FILENAME_DESCRIPTION);
-
-	/* Connect the file dialog's OK button up to a handler. */
-	gtk_signal_connect(
-		GTK_OBJECT(GTK_FILE_SELECTION(file_dialog)->ok_button),
-		"clicked", GTK_SIGNAL_FUNC(FileOpenDialog_OK), file_dialog);
-
-	/*
-	 * Ensure that the file selection dialog box is destroyed when the user
-	 * clicks CANCEL.
-	 */
-	gtk_signal_connect_object(
-		GTK_OBJECT(GTK_FILE_SELECTION(file_dialog)->cancel_button),
-		"clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy),
-		(gpointer) file_dialog);
-
-	/* Show the dialog. */
-	gtk_widget_show(GTK_WIDGET(file_dialog));
-
-	/*
-	 * To have the main window of our application being unusable while
-	 * using the dialog.
-	 */
-	gtk_window_set_modal(GTK_WINDOW(file_dialog), TRUE);
+			emugtk_new_file(selected_file);
+			g_free(selected_file);
+		}
+	}
+
+	gtk_widget_destroy(file_dialog);
 }
 
 static void
@@ -101,7 +81,6 @@ FileQuitEvent(gchar *string)
 	g_print("%s\n", string);
 #endif
 
-	emugtk_StopRunning();
 	gtk_main_quit();
 }