diff options
| author | Manolo Gouy <Manolo> | 2016-03-10 22:26:40 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-10 22:26:40 +0000 |
| commit | 31fcd84ca990ded6b96f0e3a82adc3f38d0cdb2c (patch) | |
| tree | 13212ec1fa76ebbfb144b831df6edd669acf5d69 /FL/Fl_Window.H | |
| parent | 7098924b82110cf468d3cbdc4742bd9a2632296d (diff) | |
Rewrite all window icon-related Fl_Window API with the window driver approach.
It seems this allows not to #include <windows.h> in the public header files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Window.H')
| -rw-r--r-- | FL/Fl_Window.H | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 8884d0b67..63aa67ec0 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -23,7 +23,8 @@ #define Fl_Window_H #ifdef WIN32 -#include <windows.h> +//#include <windows.h> +typedef struct HICON__* HICON; #endif #include "Fl_Group.H" @@ -75,22 +76,6 @@ class FL_EXPORT Fl_Window : public Fl_Group { Fl_X *i; // points at the system-specific stuff, but exists only after the window is mapped Fl_Window_Driver *pWindowDriver; // points at the system-specific stuff at window creatino time - struct icon_data { - const void *legacy_icon; - Fl_RGB_Image **icons; - int count; -#ifdef WIN32 - HICON big_icon; - HICON small_icon; -#elif defined(__APPLE__) // PORTME: Fl_Window_Driver - per-window icons, move to FL_X/Fl_Window_Driver - // not needed -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: define storage for per-window icons here if needed" -#else // X11 - // not needed -#endif - }; - const char* iconlabel_; char* xclass_; struct icon_data *icon_; @@ -422,12 +407,6 @@ public: #ifdef WIN32 static void default_icons(HICON big_icon, HICON small_icon); void icons(HICON big_icon, HICON small_icon); -#elif defined(__APPLE__) // PORTME: Fl_Window_Driver - per-window icon - // not needed -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: define functions to handle window icons here if needed" -#else // X11 - // not needed #endif /* for legacy compatibility */ |