Fix dead pixel in FL_GTK_UP_BOX/FRAME (STR #1471)

Use FL_COMMAND modifier in FLUID menus (CTRL for non-OSX, CMD for OSX)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5522 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 30 insertions, 30 deletions

diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index ef4182a3d..6fc0149c1 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1567,48 +1567,48 @@ void toggle_sourceview_cb(Fl_Double_Window *, void *);
 
 Fl_Menu_Item Main_Menu[] = {
 {"&File",0,0,0,FL_SUBMENU},
-  {"&New...", FL_CTRL+'n', new_cb, 0},
-  {"&Open...", FL_CTRL+'o', open_cb, 0},
-  {"&Insert...", FL_CTRL+'i', open_cb, (void*)1, FL_MENU_DIVIDER},
+  {"&New...", FL_COMMAND+'n', new_cb, 0},
+  {"&Open...", FL_COMMAND+'o', open_cb, 0},
+  {"&Insert...", FL_COMMAND+'i', open_cb, (void*)1, FL_MENU_DIVIDER},
 #define SAVE_ITEM 4
-  {"&Save", FL_CTRL+'s', save_cb, 0},
-  {"Save &As...", FL_CTRL+FL_SHIFT+'s', save_cb, (void*)1},
+  {"&Save", FL_COMMAND+'s', save_cb, 0},
+  {"Save &As...", FL_COMMAND+FL_SHIFT+'s', save_cb, (void*)1},
   {"Sa&ve A Copy...", 0, save_cb, (void*)2},
   {"Save &Template...", 0, save_template_cb},
   {"&Revert...", 0, revert_cb, 0, FL_MENU_DIVIDER},
-  {"&Print...", FL_CTRL+'p', print_menu_cb},
-  {"Write &Code...", FL_CTRL+FL_SHIFT+'c', write_cb, 0},
-  {"&Write Strings...", FL_CTRL+FL_SHIFT+'w', write_strings_cb, 0, FL_MENU_DIVIDER},
+  {"&Print...", FL_COMMAND+'p', print_menu_cb},
+  {"Write &Code...", FL_COMMAND+FL_SHIFT+'c', write_cb, 0},
+  {"&Write Strings...", FL_COMMAND+FL_SHIFT+'w', write_strings_cb, 0, FL_MENU_DIVIDER},
 #define HISTORY_ITEM 12
-  {relative_history[0], FL_CTRL+'0', open_history_cb, absolute_history[0]},
-  {relative_history[1], FL_CTRL+'1', open_history_cb, absolute_history[1]},
-  {relative_history[2], FL_CTRL+'2', open_history_cb, absolute_history[2]},
-  {relative_history[3], FL_CTRL+'3', open_history_cb, absolute_history[3]},
-  {relative_history[4], FL_CTRL+'4', open_history_cb, absolute_history[4]},
-  {relative_history[5], FL_CTRL+'5', open_history_cb, absolute_history[5]},
-  {relative_history[6], FL_CTRL+'6', open_history_cb, absolute_history[6]},
-  {relative_history[7], FL_CTRL+'7', open_history_cb, absolute_history[7]},
-  {relative_history[8], FL_CTRL+'8', open_history_cb, absolute_history[8]},
-  {relative_history[9], FL_CTRL+'9', open_history_cb, absolute_history[9], FL_MENU_DIVIDER},
-  {"&Quit", FL_CTRL+'q', exit_cb},
+  {relative_history[0], FL_COMMAND+'0', open_history_cb, absolute_history[0]},
+  {relative_history[1], FL_COMMAND+'1', open_history_cb, absolute_history[1]},
+  {relative_history[2], FL_COMMAND+'2', open_history_cb, absolute_history[2]},
+  {relative_history[3], FL_COMMAND+'3', open_history_cb, absolute_history[3]},
+  {relative_history[4], FL_COMMAND+'4', open_history_cb, absolute_history[4]},
+  {relative_history[5], FL_COMMAND+'5', open_history_cb, absolute_history[5]},
+  {relative_history[6], FL_COMMAND+'6', open_history_cb, absolute_history[6]},
+  {relative_history[7], FL_COMMAND+'7', open_history_cb, absolute_history[7]},
+  {relative_history[8], FL_COMMAND+'8', open_history_cb, absolute_history[8]},
+  {relative_history[9], FL_COMMAND+'9', open_history_cb, absolute_history[9], FL_MENU_DIVIDER},
+  {"&Quit", FL_COMMAND+'q', exit_cb},
   {0},
 {"&Edit",0,0,0,FL_SUBMENU},
-  {"&Undo", FL_CTRL+'z', undo_cb},
-  {"&Redo", FL_CTRL+FL_SHIFT+'z', redo_cb, 0, FL_MENU_DIVIDER},
-  {"C&ut", FL_CTRL+'x', cut_cb},
-  {"&Copy", FL_CTRL+'c', copy_cb},
-  {"&Paste", FL_CTRL+'v', paste_cb},
-  {"Dup&licate", FL_CTRL+'u', duplicate_cb},
+  {"&Undo", FL_COMMAND+'z', undo_cb},
+  {"&Redo", FL_COMMAND+FL_SHIFT+'z', redo_cb, 0, FL_MENU_DIVIDER},
+  {"C&ut", FL_COMMAND+'x', cut_cb},
+  {"&Copy", FL_COMMAND+'c', copy_cb},
+  {"&Paste", FL_COMMAND+'v', paste_cb},
+  {"Dup&licate", FL_COMMAND+'u', duplicate_cb},
   {"&Delete", FL_Delete, delete_cb, 0, FL_MENU_DIVIDER},
-  {"Select &All", FL_CTRL+'a', select_all_cb},
-  {"Select &None", FL_CTRL+FL_SHIFT+'a', select_none_cb, 0, FL_MENU_DIVIDER},
+  {"Select &All", FL_COMMAND+'a', select_all_cb},
+  {"Select &None", FL_COMMAND+FL_SHIFT+'a', select_none_cb, 0, FL_MENU_DIVIDER},
   {"Pr&operties...", FL_F+1, openwidget_cb},
   {"&Sort",0,sort_cb},
   {"&Earlier", FL_F+2, earlier_cb},
   {"&Later", FL_F+3, later_cb},
   {"&Group", FL_F+7, group_cb},
   {"Ung&roup", FL_F+8, ungroup_cb,0, FL_MENU_DIVIDER},
-  {"Hide O&verlays",FL_CTRL+FL_SHIFT+'o',toggle_overlays},
+  {"Hide O&verlays",FL_COMMAND+FL_SHIFT+'o',toggle_overlays},
 #define WIDGETBIN_ITEM 41
   {"Show Widget &Bin...",FL_ALT+'b',toggle_widgetbin_cb},
 #define SOURCEVIEW_ITEM 42
@@ -1647,7 +1647,7 @@ Fl_Menu_Item Main_Menu[] = {
     {"&Large",FL_ALT+'5',(Fl_Callback *)widget_size_cb,(void*)24,0,FL_NORMAL_LABEL,FL_HELVETICA,24},
     {"&Huge",FL_ALT+'6',(Fl_Callback *)widget_size_cb,(void*)32,0,FL_NORMAL_LABEL,FL_HELVETICA,32},
     {0},
-  {"&Grid and Size Settings...",FL_CTRL+'g',show_grid_cb},
+  {"&Grid and Size Settings...",FL_COMMAND+'g',show_grid_cb},
   {0},
 {"&Shell",0,0,0,FL_SUBMENU},
   {"Execute &Command...",FL_ALT+'x',(Fl_Callback *)show_shell_window},
diff --git a/src/fl_gtk.cxx b/src/fl_gtk.cxx
index 4b8d9d1d4..c609660d3 100644
--- a/src/fl_gtk.cxx
+++ b/src/fl_gtk.cxx
@@ -47,7 +47,7 @@ static void gtk_color(Fl_Color c) {
 static void gtk_up_frame(int x, int y, int w, int h, Fl_Color c) {
   gtk_color(fl_color_average(FL_WHITE, c, 0.5));
   fl_xyline(x + 2, y + 1, x + w - 3);
-  fl_yxline(x + 1, y + 2, y + h - 4);
+  fl_yxline(x + 1, y + 2, y + h - 3);
 
   gtk_color(fl_color_average(FL_BLACK, c, 0.5));
   fl_begin_loop();