From c6c92e40370863cad1d05146551298cf5c070c63 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 17 Apr 2016 05:41:05 +0000
Subject: Remove set_icons() from the virtual API of class Fl_Window_Driver
 because it is internal to some drivers.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11636 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_win32.cxx                             | 4 ++--
 src/Fl_x.cxx                                 | 2 +-
 src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H | 2 +-
 src/drivers/X11/Fl_X11_Window_Driver.H       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index f1f4a38db..2baec35e0 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1856,7 +1856,7 @@ Fl_X* Fl_X::make(Fl_Window* w) {
   x->next = Fl_X::first;
   Fl_X::first = x;
 
-  w->pWindowDriver->set_icons();
+  ((Fl_WinAPI_Window_Driver*)w->pWindowDriver)->set_icons();
 
   if (w->fullscreen_active()) {
   /* We need to make sure that the fullscreen is created on the
@@ -2099,7 +2099,7 @@ void Fl_Window::icons(HICON big_icon, HICON small_icon)
     ((Fl_WinAPI_Window_Driver*)pWindowDriver)->icon_->small_icon = CopyIcon(small_icon);
   
   if (Fl_X::i(this))
-    pWindowDriver->set_icons();
+    ((Fl_WinAPI_Window_Driver*)pWindowDriver)->set_icons();
 }
 
 /** Sets the default window icons.
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index ca1e1bb7f..376f230fb 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -2526,7 +2526,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap)
     XSetWMHints(fl_display, xp->xid, hints);
     XFree(hints);
 
-    win->pWindowDriver->set_icons();
+    ((Fl_X11_Window_Driver*)win->pWindowDriver)->set_icons();
   }
 
   // set the window type for menu and tooltip windows to avoid animations (compiz)
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
index 8548bfea0..f1d36b6a1 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
@@ -95,12 +95,12 @@ public:
   virtual const void *icon() const;
   virtual void icon(const void * ic);
   virtual void free_icons();
+  void set_icons(); // driver-internal support function
   // this one is implemented in Fl_win32.cxx
   virtual void capture_titlebar_and_borders(Fl_Shared_Image*& top, Fl_Shared_Image*& left, Fl_Shared_Image*& bottom, Fl_Shared_Image*& right);
   virtual void wait_for_expose();
   virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y,
                      void (*draw_area)(void*, int,int,int,int), void* data);
-  virtual void set_icons();
 };
 
 
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index 6abd04dca..e976619ee 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -110,12 +110,12 @@ public:
   virtual const void *icon() const;
   virtual void icon(const void * ic);
   virtual void free_icons();
+  void set_icons(); // driver-internal support function
   virtual void capture_titlebar_and_borders(Fl_Shared_Image*& top, Fl_Shared_Image*& left, Fl_Shared_Image*& bottom, Fl_Shared_Image*& right);
   virtual void wait_for_expose();
   virtual int can_do_overlay();
   virtual void redraw_overlay();
   virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data);
-  virtual void set_icons();
 };
 
 
-- 
cgit v1.2.3