From 6302b3da00f8116e1bf62629c6d3ab0f719d1a33 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Tue, 22 Mar 2016 13:27:22 +0000
Subject: Move all icon-support data to the platform-specific
 Fl_XXX_Window_Driver class

because these data are platform-specific.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11399 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H')

diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
index d5abdd54e..051a86300 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
@@ -43,13 +43,6 @@
  ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx?
  */
 
-struct Fl_Window_Driver::icon_data {
-  const void *legacy_icon;
-  Fl_RGB_Image **icons;
-  int count;
-  HICON big_icon;
-  HICON small_icon;
-};
 
 struct Fl_Window_Driver::shape_data_type {
   int lw_; ///<  width of shape image
@@ -60,6 +53,14 @@ struct Fl_Window_Driver::shape_data_type {
 
 class FL_EXPORT Fl_WinAPI_Window_Driver : public Fl_Window_Driver
 {
+  friend class Fl_Window;
+  struct icon_data {
+    const void *legacy_icon;
+    Fl_RGB_Image **icons;
+    int count;
+    HICON big_icon;
+    HICON small_icon;
+  };
 private:
   RECT border_width_title_bar_height(int &bx, int &by, int &bt);
   void shape_bitmap_(Fl_Image* b);
@@ -68,6 +69,7 @@ public:
   Fl_WinAPI_Window_Driver(Fl_Window*);
   ~Fl_WinAPI_Window_Driver();
 
+  struct icon_data *icon_;
   // --- window data
   virtual int decorated_w();
   virtual int decorated_h();
@@ -84,7 +86,6 @@ public:
   virtual const void *icon() const;
   virtual void icon(const void * ic);
   virtual void free_icons();
-  void icons(HICON big_icon, HICON small_icon);
   // 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();
-- 
cgit v1.2.3