From eeb65bef23b2d269ea38474c04a55ffca5c6e63e Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sun, 10 Jan 2016 19:08:16 +0000 Subject: 1) Replicate in branch-1.3-porting all recent changes of branch-1.3 2) Advance branch-1.3-porting with new function Fl_X::capture_titlebar_and_borders() that contains all the platform-specific code of all operations related to drawing window borders and title bars. What is platform-specific and what is not is therefore much clearer, to ease porting. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11002 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Paged_Device.H | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'FL/Fl_Paged_Device.H') diff --git a/FL/Fl_Paged_Device.H b/FL/Fl_Paged_Device.H index 9dd6b7d8d..968f87b74 100644 --- a/FL/Fl_Paged_Device.H +++ b/FL/Fl_Paged_Device.H @@ -36,17 +36,9 @@ or Fl_PostScript_File_Device instead. */ class FL_EXPORT Fl_Paged_Device : public Fl_Surface_Device { -#ifdef __APPLE__ - // not needed -#elif defined(WIN32) friend class Fl_Copy_Surface; - void draw_decorated_window(Fl_Window *win, int x_offset, int y_offset, Fl_Surface_Device *toset); -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: define member variables to support Fl_Copy_Surface in Fl_Paged_Device" -#else // X11 - friend class Fl_Copy_Surface; - void draw_decorated_window(Fl_Window *win, int x_offset, int y_offset, Fl_Surface_Device *toset); -#endif + friend class Fl_Image_Surface; + void draw_decorated_window(Fl_Window *win, int x_offset, int y_offset); public: /** \brief Possible page formats. -- cgit v1.2.3