[BACK]Return to gtk_menu.c CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11 / gtk2

Diff for /np2/x11/gtk2/gtk_menu.c between versions 1.22 and 1.28

version 1.22, 2011/12/17 16:20:05 version 1.28, 2012/01/23 04:57:24
Line 1 Line 1
 /*  /*
  * Copyright (c) 2004 NONAKA Kimihiro (aw9k-nnk@asahi-net.or.jp)   * Copyright (c) 2004-2011 NONAKA Kimihiro
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 241  static GtkRadioActionEntry f12key_entrie Line 241  static GtkRadioActionEntry f12key_entrie
 { "f12mouse", NULL, "F12 = _Mouse",     NULL, NULL, 0 },  { "f12mouse", NULL, "F12 = _Mouse",     NULL, NULL, 0 },
 { "f12copy",  NULL, "F12 = Co_py",      NULL, NULL, 1 },  { "f12copy",  NULL, "F12 = Co_py",      NULL, NULL, 1 },
 { "f12stop",  NULL, "F12 = S_top",      NULL, NULL, 2 },  { "f12stop",  NULL, "F12 = S_top",      NULL, NULL, 2 },
   { "f12help",  NULL, "F12 = _Help",      NULL, NULL, 7 },
 { "f12equal", NULL, "F12 = tenkey [=]", NULL, NULL, 4 },  { "f12equal", NULL, "F12 = tenkey [=]", NULL, NULL, 4 },
 { "f12comma", NULL, "F12 = tenkey [,]", NULL, NULL, 3 },  { "f12comma", NULL, "F12 = tenkey [,]", NULL, NULL, 3 },
 };  };
Line 416  static const gchar *ui_info = Line 417  static const gchar *ui_info =
 "    <menuitem action='f12mouse'/>\n"  "    <menuitem action='f12mouse'/>\n"
 "    <menuitem action='f12copy'/>\n"  "    <menuitem action='f12copy'/>\n"
 "    <menuitem action='f12stop'/>\n"  "    <menuitem action='f12stop'/>\n"
   "    <menuitem action='f12help'/>\n"
 "    <menuitem action='f12equal'/>\n"  "    <menuitem action='f12equal'/>\n"
 "    <menuitem action='f12comma'/>\n"  "    <menuitem action='f12comma'/>\n"
 "   </menu>\n"  "   </menu>\n"
Line 577  cb_bmpsave(GtkAction *action, gpointer u Line 579  cb_bmpsave(GtkAction *action, gpointer u
                 goto end;                  goto end;
   
         gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);          gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
 #if iGTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 8  #if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 8
         gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),          gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
             TRUE);              TRUE);
 #endif  #endif
Line 768  cb_diskopen(GtkAction *action, gpointer  Line 770  cb_diskopen(GtkAction *action, gpointer 
                 gtk_file_filter_add_pattern(filter, "*.2[hH][dD]");                  gtk_file_filter_add_pattern(filter, "*.2[hH][dD]");
                 gtk_file_filter_add_pattern(filter, "*.[fF][dD][iI]");                  gtk_file_filter_add_pattern(filter, "*.[fF][dD][iI]");
                 gtk_file_filter_add_pattern(filter, "*.[fF][sS]");                  gtk_file_filter_add_pattern(filter, "*.[fF][sS]");
                   gtk_file_filter_add_pattern(filter, "*.[fF][lL][pP]");
                 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);                  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
         }          }
         filter = gtk_file_filter_new();          filter = gtk_file_filter_new();
Line 784  cb_diskopen(GtkAction *action, gpointer  Line 787  cb_diskopen(GtkAction *action, gpointer 
                 gtk_file_filter_add_pattern(filter, "*.2[hH][dD]");                  gtk_file_filter_add_pattern(filter, "*.2[hH][dD]");
                 gtk_file_filter_add_pattern(filter, "*.[fF][dD][iI]");                  gtk_file_filter_add_pattern(filter, "*.[fF][dD][iI]");
                 gtk_file_filter_add_pattern(filter, "*.[fF][sS]");                  gtk_file_filter_add_pattern(filter, "*.[fF][sS]");
                   gtk_file_filter_add_pattern(filter, "*.[fF][lL][pP]");
                 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);                  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
         }          }
         gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);          gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
Line 1037  cb_newdisk(GtkAction *action, gpointer u Line 1041  cb_newdisk(GtkAction *action, gpointer u
                 goto end;                  goto end;
   
         gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);          gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
 #if iGTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 8  #if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 8
         gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),          gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
             TRUE);              TRUE);
 #endif  #endif
Line 1718  cb_soundboard(gint idx) Line 1722  cb_soundboard(gint idx)
 static void  static void
 cb_radio(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data)  cb_radio(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data)
 {  {
         guint value = (guint)gtk_radio_action_get_current_value(action);          gint value = gtk_radio_action_get_current_value(action);
         guint menu_idx = (guint)GPOINTER_TO_INT(user_data);          guint menu_idx = (guint)GPOINTER_TO_INT(user_data);
         gint i;          gint i;
   
Removed from v.1.22  
changed lines
  Added in v.1.28

RetroPC.NET-CVS <cvs@retropc.net>