diff options
| author | Manolo Gouy <Manolo> | 2016-01-27 18:11:20 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-01-27 18:11:20 +0000 |
| commit | 8e3f66073f8e30e874eb3e6cf76ab0a614c39aad (patch) | |
| tree | de1aaad8e102b792439c7cdef6dbb826d6d1ae90 /src/Fl_Window_shape.cxx | |
| parent | 1c4661c4816d9e9b8cc37165a554a4d60c5339da (diff) | |
1) Added a new way to detect whether the drawing operation is using the platform's native driver
and whether we are printing: virtual int Fl_Graphics_Driver::has_feature(driver_feature feature)
This is also because it is not convenient to derive a printer-specific driver with its own
implementation of virtual functions when this implementation differs only in one line of code.
2) Solved the problem of inclusion of non public header by the public header FL/Fl_Device.H:
bracket this with #if FL_LIBRARY / #endif so this non public header is included only when building
FLTK itself.
3) Removed several (but not all) of the FLTK_ABI_VERSION guards that are no longer
useful for code targeting FLTK 1.4.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11063 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Window_shape.cxx')
| -rw-r--r-- | src/Fl_Window_shape.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/Fl_Window_shape.cxx b/src/Fl_Window_shape.cxx index da9423841..37bda6884 100644 --- a/src/Fl_Window_shape.cxx +++ b/src/Fl_Window_shape.cxx @@ -285,9 +285,6 @@ void Fl_Window::shape_pixmap_(Fl_Image* pixmap) { delete rgba; } -#if FLTK_ABI_VERSION < 10303 && !defined(FL_DOXYGEN) -Fl_Window::shape_data_type* Fl_Window::shape_data_ = NULL; -#endif /** Assigns a non-rectangular shape to the window. This function gives an arbitrary shape (not just a rectangular region) to an Fl_Window. @@ -323,10 +320,9 @@ Fl_Window::shape_data_type* Fl_Window::shape_data_ = NULL; A usage example is found at example/shapedwindow.cxx. - \version 1.3.3 (and requires compilation with FLTK_ABI_VERSION >= 10303) + \version 1.3.3 (and requires compilation with FL_ABI_VERSION >= 10303) */ void Fl_Window::shape(const Fl_Image* img) { -#if FLTK_ABI_VERSION >= 10303 if (shape_data_) { if (shape_data_->todelete_) { delete shape_data_->todelete_; } #if defined(__APPLE__) @@ -343,7 +339,6 @@ void Fl_Window::shape(const Fl_Image* img) { else if (d == 0) shape_bitmap_((Fl_Image*)img); else if (d == 2 || d == 4) shape_alpha_((Fl_Image*)img, d - 1); else if ((d == 1 || d == 3) && img->count() == 1) shape_alpha_((Fl_Image*)img, 0); -#endif } void Fl_Window::draw() { |