projects
/
emu8051.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Align memory data columns text on left side
[emu8051.git]
/
src
/
filemenu.c
diff --git
a/src/filemenu.c
b/src/filemenu.c
index
1f3df9f
..
47e18aa
100644
(file)
--- a/
src/filemenu.c
+++ b/
src/filemenu.c
@@
-46,12
+46,9
@@
remember_current_folder(GtkFileChooser *chooser)
if (folder != NULL) {
if (strlen(folder) >= MAX_FILENAME_LENGTH) {
/* Non-critical error */
if (folder != NULL) {
if (strlen(folder) >= MAX_FILENAME_LENGTH) {
/* Non-critical error */
-
g_print("current folder name too long for buffer\n
");
+
log_warn("current folder name too long for buffer
");
} else {
} else {
-#if defined(DEBUG)
- g_print("current folder = %s\n", folder);
-#endif
-
+ log_info("current folder = %s", folder);
strncpy(previous_folder, folder, MAX_FILENAME_LENGTH);
}
strncpy(previous_folder, folder, MAX_FILENAME_LENGTH);
}
@@
-66,9
+63,7
@@
FileOpenEvent(GtkObject *object, gpointer data)
char *dir;
char *cwd = NULL;
char *dir;
char *cwd = NULL;
-#if defined(DEBUG)
- g_print("FileOpenEvent()\n");
-#endif
+ log_info("FileOpenEvent()");
/* Create a new file selection widget. */
file_dialog = gtk_file_chooser_dialog_new(
/* Create a new file selection widget. */
file_dialog = gtk_file_chooser_dialog_new(
@@
-97,9
+92,7
@@
FileOpenEvent(GtkObject *object, gpointer data)
GTK_FILE_CHOOSER(file_dialog));
if (selected_file != NULL) {
GTK_FILE_CHOOSER(file_dialog));
if (selected_file != NULL) {
-#if defined(DEBUG)
- g_print("emugtk_File = %s\n", selected_file);
-#endif
+ log_info("emugtk_File = %s", selected_file);
remember_current_folder(GTK_FILE_CHOOSER(file_dialog));
remember_current_folder(GTK_FILE_CHOOSER(file_dialog));
@@
-114,10
+107,6
@@
FileOpenEvent(GtkObject *object, gpointer data)
static void
FileQuitEvent(gchar *string)
{
static void
FileQuitEvent(gchar *string)
{
-#if defined(DEBUG)
- g_print("%s\n", string);
-#endif
-
gtk_main_quit();
}
gtk_main_quit();
}
@@
-131,22
+120,20
@@
FileAddMenu(GtkWidget *menu_bar)
/* Create the 'open' item. */
item = gtk_menu_item_new_with_label(FILENAME_DESCRIPTION);
/* Create the 'open' item. */
item = gtk_menu_item_new_with_label(FILENAME_DESCRIPTION);
- gtk_menu_
append(GTK_MENU
(menu), item);
+ gtk_menu_
shell_append(GTK_MENU_SHELL
(menu), item);
/* Attach the callback functions to the activate signal. */
/* Attach the callback functions to the activate signal. */
- gtk_signal_connect_object(GTK_OBJECT(item), "activate",
- GTK_SIGNAL_FUNC(FileOpenEvent), NULL);
+ g_signal_connect(item, "activate", G_CALLBACK(FileOpenEvent), NULL);
AddMenuSeparator(menu);
item = gtk_menu_item_new_with_label("Exit");
AddMenuSeparator(menu);
item = gtk_menu_item_new_with_label("Exit");
- gtk_menu_
append(GTK_MENU
(menu), item);
+ gtk_menu_
shell_append(GTK_MENU_SHELL
(menu), item);
/* We can attach the Quit menu item to our exit function */
/* We can attach the Quit menu item to our exit function */
- gtk_signal_connect_object(GTK_OBJECT(item), "activate",
- GTK_SIGNAL_FUNC(FileQuitEvent),
- (gpointer) "file.quit");
+ g_signal_connect(item, "activate", G_CALLBACK(FileQuitEvent),
+ (gpointer) "file.quit");
/* Adding submenu title. */
item = gtk_menu_item_new_with_label("File");
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
/* Adding submenu title. */
item = gtk_menu_item_new_with_label("File");
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
- gtk_menu_
bar_append(GTK_MENU_BAR(menu_bar)
, item);
+ gtk_menu_
shell_append((GtkMenuShell *) menu_bar
, item);
}
}