diff options
-rw-r--r-- | client/red_window.h | 2 | ||||
-rw-r--r-- | client/windows/red_window.cpp | 14 | ||||
-rw-r--r-- | client/x11/red_window.cpp | 3 |
3 files changed, 14 insertions, 5 deletions
diff --git a/client/red_window.h b/client/red_window.h index dc5bad79..1c7237b1 100644 --- a/client/red_window.h +++ b/client/red_window.h @@ -70,7 +70,7 @@ public: void release_mouse(); void start_key_interception(); void stop_key_interception(); - void set_menu(Menu* menu); + int set_menu(Menu* menu); #ifdef USE_OPENGL void untouch_context(); diff --git a/client/windows/red_window.cpp b/client/windows/red_window.cpp index c86c458e..e436f833 100644 --- a/client/windows/red_window.cpp +++ b/client/windows/red_window.cpp @@ -1064,18 +1064,26 @@ void RedWindow_p::release_menu(Menu* menu) } } -void RedWindow::set_menu(Menu* menu) +int RedWindow::set_menu(Menu* menu) { release_menu(_menu); _menu = NULL; if (!menu) { - return; + return 0; } - _menu = menu->ref(); + _sys_menu = GetSystemMenu(_win, FALSE); + if (! _sys_menu) { + return -1; + } + + _menu = menu->ref(); + insert_separator(_sys_menu); insert_menu(_menu, _sys_menu, _commands_map); + + return 0; } static LRESULT CALLBACK MessageFilterProc(int nCode, WPARAM wParam, LPARAM lParam) diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp index 2e98ae25..86ddd3bd 100644 --- a/client/x11/red_window.cpp +++ b/client/x11/red_window.cpp @@ -2218,8 +2218,9 @@ void RedWindow::on_pointer_leave() } } -void RedWindow::set_menu(Menu* menu) +int RedWindow::set_menu(Menu* menu) { + return 0; } void RedWindow::init() |