diff options
| author | Manolo Gouy <Manolo> | 2016-03-22 13:27:22 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-22 13:27:22 +0000 |
| commit | 6302b3da00f8116e1bf62629c6d3ab0f719d1a33 (patch) | |
| tree | da164eb125131ccefcbcbd1010e70db09a3ae132 /FL | |
| parent | b8e6c430e8bb1b4cec2f309f2835d7b81240749a (diff) | |
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
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Window.H | 10 | ||||
| -rw-r--r-- | FL/Fl_Window_Driver.H | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index c71326550..abdcb95b2 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -22,11 +22,6 @@ #ifndef Fl_Window_H #define Fl_Window_H -#ifdef WIN32 -//#include <windows.h> -typedef struct HICON__* HICON; -#endif - #include "Fl_Group.H" #include "Fl_Bitmap.H" #include <stdlib.h> @@ -37,7 +32,6 @@ typedef struct HICON__* HICON; class Fl_X; class Fl_Window_Driver; class Fl_RGB_Image; -class Fl_Shared_Image; class Fl_Double_Window; /** @@ -77,7 +71,6 @@ class FL_EXPORT Fl_Window : public Fl_Group { const char* iconlabel_; char* xclass_; - struct icon_data *icon_; // size_range stuff: int minw, minh, maxw, maxh; int dw, dh, aspect; @@ -403,6 +396,9 @@ public: void icons(const Fl_RGB_Image*[], int); #ifdef WIN32 + typedef struct HICON__* HICON; + // These 2 member functions break the driver model but are kept for back compatibility. + // They are implemented in Fl_WinAPI_Window_Driver.cxx static void default_icons(HICON big_icon, HICON small_icon); void icons(HICON big_icon, HICON small_icon); #endif diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index ff1c84c8a..bc9e1d57c 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -44,8 +44,6 @@ class FL_EXPORT Fl_Window_Driver protected: Fl_Window *pWindow; - struct icon_data; - icon_data *icon_; struct shape_data_type; shape_data_type *shape_data_; ///< non-null means the window has a non-rectangular shape |