diff options
Diffstat (limited to 'src/drivers/Wayland')
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Window_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H index 60e346915..47083673e 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H @@ -98,7 +98,7 @@ public: const Fl_Image* shape() FL_OVERRIDE; // --- window management - Fl_X *makeWindow() FL_OVERRIDE; + void makeWindow() FL_OVERRIDE; void take_focus() FL_OVERRIDE; void flush() FL_OVERRIDE; void flush_overlay() FL_OVERRIDE; diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index f3d9463e5..6c86aba0c 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -1101,14 +1101,14 @@ static void process_menu_or_tooltip(struct wld_window *new_window) { } -Fl_X *Fl_Wayland_Window_Driver::makeWindow() +void Fl_Wayland_Window_Driver::makeWindow() { struct wld_window *new_window; Fl_Wayland_Screen_Driver::output *output; wait_for_expose_value = 1; - if (pWindow->parent() && !pWindow->window()) return NULL; - if (pWindow->parent() && !pWindow->window()->shown()) return NULL; + if (pWindow->parent() && !pWindow->window()) return; + if (pWindow->parent() && !pWindow->window()->shown()) return; new_window = (struct wld_window *)calloc(1, sizeof *new_window); new_window->fl_win = pWindow; @@ -1220,7 +1220,6 @@ Fl_X *Fl_Wayland_Window_Driver::makeWindow() pWindow->redraw(); // make sure each popup is mapped with its constraints before mapping next popup if (pWindow->menu_window()) pWindow->wait_for_expose(); - return xp; } Fl_Wayland_Window_Driver::type_for_resize_window_between_screens Fl_Wayland_Window_Driver::data_for_resize_window_between_screens_ = {0, false}; |