diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2018-06-23 17:04:18 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2018-06-23 17:04:18 +0000 |
| commit | b1598dc70362f331da7a65f1e5ddece7c88299f3 (patch) | |
| tree | b86ceda8b546d19b0bb1d4cfc7b8babdd53c3f3c /FL | |
| parent | a9fd08ff5ab8bbf3838200ceace671a72627d212 (diff) | |
Removed macro FL_PORTING, as it has been more confusing than helpful.
The original intention of FL_PORTING was to mark all places in the
source code where changes are required to port FLTK to a new platform.
Thanks to the driver system, this approach has become somewhat
misleading, so I removed all references.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12969 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Gl_Window_Driver.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Screen_Driver.H | 3 | ||||
| -rw-r--r-- | FL/Fl_Window_Driver.H | 3 | ||||
| -rw-r--r-- | FL/platform.H | 6 | ||||
| -rw-r--r-- | FL/platform_types.h | 18 | ||||
| -rw-r--r-- | FL/porting.H | 38 |
6 files changed, 0 insertions, 72 deletions
diff --git a/FL/Fl_Gl_Window_Driver.H b/FL/Fl_Gl_Window_Driver.H index ccad677b7..4f4d9289c 100644 --- a/FL/Fl_Gl_Window_Driver.H +++ b/FL/Fl_Gl_Window_Driver.H @@ -26,10 +26,6 @@ #ifndef Fl_Gl_Window_Driver_H #define Fl_Gl_Window_Driver_H -#if defined(FL_PORTING) -# pragma message "FL_PORTING: please, derive and implement the Fl_Gl_Window_Driver class for your platform" -#endif - #include <FL/Fl_Gl_Window.H> class Fl_Gl_Choice; diff --git a/FL/Fl_Screen_Driver.H b/FL/Fl_Screen_Driver.H index 1af64cba7..3a75d2c0c 100644 --- a/FL/Fl_Screen_Driver.H +++ b/FL/Fl_Screen_Driver.H @@ -136,9 +136,6 @@ public: virtual void release_keyboard() { } // read raw image from a window or an offscreen buffer -#if defined(FL_PORTING) -# pragma message "FL_PORTING: implement code to read RGB data from screen" -#endif /* Member function read_win_rectangle() supports the public function fl_read_image() which captures pixel data either from the current window or from an offscreen buffer. diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index 056a4adab..5962a5180 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -187,9 +187,6 @@ public: // --- window printing/drawing helper virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right); -#if defined(FL_PORTING) -# pragma message "FL_PORTING: implement scrolling of the screen contents" -#endif virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data) { return 0; } static inline Fl_Window_Driver* driver(const Fl_Window *win) {return win->pWindowDriver;} diff --git a/FL/platform.H b/FL/platform.H index 2df6566b0..2944e9333 100644 --- a/FL/platform.H +++ b/FL/platform.H @@ -39,12 +39,6 @@ class Fl_Window; # include "win32.H" # elif defined(__APPLE__) # include "mac.H" -# elif defined(USE_SDL) -# pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals" -# include "porting.H" -# elif defined(FL_PORTING) -# pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals" -# include "porting.H" # elif defined(__ANDROID__) # include "android.H" # else // X11 diff --git a/FL/platform_types.h b/FL/platform_types.h index d90e37afa..771f611a9 100644 --- a/FL/platform_types.h +++ b/FL/platform_types.h @@ -134,24 +134,6 @@ typedef struct __GLXcontextRec *GLContext; #include <sys/types.h> #include <dirent.h> - -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: define OS-dependent types" -typedef void* Fl_Offscreen; -typedef void* Fl_Bitmask; -typedef void *Fl_Region; -typedef int FL_SOCKET; -typedef void *GLContext; -# pragma message "FL_PORTING: define struct dirent and implement scandir() for the platform" -struct dirent {char d_name[1];}; -# pragma message "FL_PORTING: define struct stat and implement Fl_XXX_System_Driver::stat() for the platform" -struct stat { /* the FLTK source code uses part of the stat() API */ - unsigned st_mode; - unsigned st_size; -}; -#define S_IFDIR 0040000 /* directory */ -#define S_IFREG 0100000 /* regular */ - #else /* X11 */ typedef unsigned long Fl_Offscreen; diff --git a/FL/porting.H b/FL/porting.H deleted file mode 100644 index c1b586f48..000000000 --- a/FL/porting.H +++ /dev/null @@ -1,38 +0,0 @@ -// -// "$Id$" -// -// Template header file for the Fast Light Tool Kit (FLTK). -// -// Copyright 2016-2018 by Bill Spitzak and others. -// -// This library is free software. Distribution and use rights are outlined in -// the file "COPYING" which should have been included with this file. If this -// file is missing or damaged, see the license at: -// -// http://www.fltk.org/COPYING.php -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php -// - -// Do not directly include this file, instead use <FL/platform.H>. - -// These types and variables give access to internal, platform-specific data through the public API. -// They require to include platform.H (in contrast to types defined in platform_types.h) - -#if !defined(FL_PLATFORM_H) -# error "Never use <FL/porting.H> directly; include <FL/platform.H> instead." -#endif // !FL_PLATFORM_H - -typedef void *Window; // used by fl_find(), fl_xid() and class Fl_X - -/* Reference to the current device context - For back-compatibility only. The preferred procedure to get this reference is - Fl_Surface_Device::surface()->driver()->gc(). - */ -extern void *fl_gc; - -// -// End of "$Id$". -// |
