Virtual member Fl_Window_Driver::makeWindow() now returns void

6 files changed, 8 insertions, 10 deletions

diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
index 4c86696e0..cc43d2161 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
@@ -115,7 +115,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.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};
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
index bc834b48c..4bde200a0 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
@@ -85,7 +85,7 @@ public:
   const Fl_Image* shape() FL_OVERRIDE;
 
   // --- window management
-  Fl_X *makeWindow() FL_OVERRIDE;
+  void makeWindow() FL_OVERRIDE;
   void size_range() FL_OVERRIDE {
     // currently nothing to do
   }
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index 6cb54dd95..cd48c8098 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -99,7 +99,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_double() FL_OVERRIDE;
   void flush_overlay() FL_OVERRIDE;
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index 5b44bedec..27bd64b10 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -550,10 +550,9 @@ int Fl_X11_Window_Driver::scroll(int src_x, int src_y, int src_w, int src_h, int
   return 0;
 }
 
-Fl_X *Fl_X11_Window_Driver::makeWindow()
+void Fl_X11_Window_Driver::makeWindow()
 {
   Fl_X::make_xid(pWindow, fl_visual, fl_colormap);
-  return Fl_X::i(pWindow);
 }
 
 const Fl_Image* Fl_X11_Window_Driver::shape() {