diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-01-03 22:54:29 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-01-03 22:54:29 +0000 |
| commit | acf6c881d36b675d755433d3cf48613bc46ed78d (patch) | |
| tree | 13cebc8f8fd918767595da12fafb5a600db2feb3 /FL/Fl_Window.H | |
| parent | 933b00b9c9fe55d01a7f1c4831f171482806f85b (diff) | |
Updated platform specific #if's to report unimplemented code when compiling with FL_PORTING defined and WIN32 and __APPLE__ undefined>
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@10989 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Window.H')
| -rw-r--r-- | FL/Fl_Window.H | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index f84ab1c9a..0a69a4c13 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -103,6 +103,12 @@ class FL_EXPORT Fl_Window : public Fl_Group { #ifdef WIN32 HICON big_icon; HICON small_icon; +#elif defined(__APPLE__) + // not needed +#elif defined(FL_PORTING) +# pragma message "FL_PORTING: define storage for per-window icons here if needed" +#else // X11 + // not needed #endif }; @@ -129,6 +135,12 @@ protected: #if defined(__APPLE__) typedef struct CGImage* CGImageRef; CGImageRef mask; +#elif defined(WIN32) + // not needed +#elif defined(FL_PORTING) +# pragma message "FL_PORTING: define storage for a window mask here if needed" +#else // X11 + // not needed #endif Fl_Bitmap *todelete_; ///< auxiliary bitmap image }; @@ -147,7 +159,10 @@ public: \see void shape(const Fl_Image* img) */ inline void shape(const Fl_Image& b) { shape(&b); } -#if ! (defined(WIN32) || defined(__APPLE__) || defined(FL_DOXYGEN)) +#if defined(WIN32) || defined(__APPLE__) || defined(FL_DOXYGEN) +#elif defined(FL_PORTING) +# pragma message "FL_PORTING: do you need a combine_mask() function in Fl_Window?" +#else // X11 void combine_mask(void); #endif private: @@ -471,6 +486,12 @@ public: #ifdef WIN32 static void default_icons(HICON big_icon, HICON small_icon); void icons(HICON big_icon, HICON small_icon); +#elif defined(__APPLE__) + // 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 */ |
