diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp index e25f2418f2effeff5f433008ab24861d057b1084..befc978fdfc8abd9d8b0cc5fc6e894eededf9bf0 100644 --- a/Fltk/graphicWindow.cpp +++ b/Fltk/graphicWindow.cpp @@ -2079,9 +2079,9 @@ static Fl_Menu_Item bar_table[] = { {"Split Horizontally", 0, (Fl_Callback *)file_window_cb, (void*)"split_h"}, {"Split Vertically", 0, (Fl_Callback *)file_window_cb, (void*)"split_v"}, {"Unsplit", 0, (Fl_Callback *)file_window_cb, (void*)"split_u", FL_MENU_DIVIDER}, - {"Minimize", FL_META+'m', (Fl_Callback *)window_cb, (void*)"minimize"}, + {"Minimize", FL_CTRL+'m', (Fl_Callback *)window_cb, (void*)"minimize"}, {"Zoom", 0, (Fl_Callback *)window_cb, (void*)"zoom", FL_MENU_DIVIDER}, - {"Attach/Detach Menu", FL_META+'d', (Fl_Callback *)attach_detach_menu_cb, 0, FL_MENU_DIVIDER}, + {"Attach/Detach Menu", FL_CTRL+'d', (Fl_Callback *)attach_detach_menu_cb, 0, FL_MENU_DIVIDER}, {"Bring All to Front", 0, (Fl_Callback *)window_cb, (void*)"front"}, {0}, {"&Help", 0, 0, 0, FL_SUBMENU}, @@ -2987,7 +2987,7 @@ void graphicWindow::attachMenu() gl[i]->resize(w, gl[i]->y(), gl[i]->w() - w, gl[i]->h()); } tile->add(onelab); - onelab->resize(0, 0, w, tile->h()); + onelab->resize(0, bar ? bar->h() : 0, w, tile->h()); tile->redraw(); } diff --git a/Fltk/mainWindow.h b/Fltk/mainWindow.h index d92dcf255609be4359970eb7d4ad4178d8f4599c..440194a46ff699f1309fd35aa5f769add62cc4be 100644 --- a/Fltk/mainWindow.h +++ b/Fltk/mainWindow.h @@ -12,6 +12,7 @@ // Derive the main window from Fl_Window (it shows up faster that way) class mainWindow : public Fl_Window { + void (*myhandle)(int event); private: int handle(int event) { @@ -34,8 +35,8 @@ class mainWindow : public Fl_Window { return Fl_Window::handle(event); } public: - mainWindow(int w, int h, bool nonModal, const char *l=0) - : Fl_Window(w, h, l) + mainWindow(int w, int h, bool nonModal, const char *l=0) + : Fl_Window(w, h, l) { if(nonModal) set_non_modal(); }