summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2018-06-23 17:04:18 +0000
committerMatthias Melcher <fltk@matthiasm.com>2018-06-23 17:04:18 +0000
commitb1598dc70362f331da7a65f1e5ddece7c88299f3 (patch)
treeb86ceda8b546d19b0bb1d4cfc7b8babdd53c3f3c /src
parenta9fd08ff5ab8bbf3838200ceace671a72627d212 (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 'src')
-rw-r--r--src/Fl_Gl_Choice.H5
-rw-r--r--src/Fl_Printer.cxx5
-rw-r--r--src/Fl_porting.cxx342
-rw-r--r--src/config_lib.h8
-rw-r--r--src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx4
-rw-r--r--src/drivers/Pico/Fl_Pico_Graphics_Driver.H1
-rw-r--r--src/fl_call_main.c6
-rw-r--r--src/gl_draw.cxx3
-rw-r--r--src/xutf8/lcUniConv/cp936ext.h4
9 files changed, 0 insertions, 378 deletions
diff --git a/src/Fl_Gl_Choice.H b/src/Fl_Gl_Choice.H
index 3ef4c5a30..bdee1c6c8 100644
--- a/src/Fl_Gl_Choice.H
+++ b/src/Fl_Gl_Choice.H
@@ -64,11 +64,6 @@
#endif // FL_CFG_GFX_GDI
-#if defined(FL_PORTING) && !defined(FL_GL_CHOICE_PLATFORM_SPECIFIC_MEMBERS)
-# pragma message "Define platform-specific members of the Fl_Gl_Choice class"
-# define FL_GL_CHOICE_PLATFORM_SPECIFIC_MEMBERS
-#endif
-
// Describes crap needed to create a GLContext.
class Fl_Gl_Choice {
friend class Fl_Gl_Window_Driver;
diff --git a/src/Fl_Printer.cxx b/src/Fl_Printer.cxx
index c9f0d2a2c..bf5ee9082 100644
--- a/src/Fl_Printer.cxx
+++ b/src/Fl_Printer.cxx
@@ -20,11 +20,6 @@
#include <FL/Fl_Printer.H>
#include <config.h>
-#ifdef FL_PORTING
-# pragma message "FL_PORTING: implement print support for your platform, or define FL_NO_PRINT_SUPPORT"
-#define FL_NO_PRINT_SUPPORT 1
-#endif
-
#if defined(FL_NO_PRINT_SUPPORT)
#include <FL/Fl_PostScript.H>
diff --git a/src/Fl_porting.cxx b/src/Fl_porting.cxx
deleted file mode 100644
index 649824163..000000000
--- a/src/Fl_porting.cxx
+++ /dev/null
@@ -1,342 +0,0 @@
-//
-// "$Id$"
-//
-// core code stubs for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2015 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
-//
-
-#ifndef FL_DOXYGEN
-#include <FL/Fl.H>
-#include <FL/fl_utf8.h>
-#include <FL/Fl_Window.H>
-#include <FL/fl_draw.H>
-#include <FL/Enumerations.H>
-#include <FL/Fl_Tooltip.H>
-#include <FL/Fl_Paged_Device.H>
-#include "flstring.h"
-#include "Fl_Font.H"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <time.h>
-#include <signal.h>
-
-extern unsigned int fl_codepage;
-
-Fl_Fontdesc* fl_fonts = NULL;
-
-void *fl_gc = NULL;
-
-Window fl_window = NULL;
-
-void fl_set_status(int x, int y, int w, int h)
-{
-# pragma message "FL_PORTING: implement fl_set_status"
-}
-
-void Fl::add_fd(int n, int events, void (*cb)(FL_SOCKET, void*), void *v) {
-# pragma message "FL_PORTING: implement Fl::add_fd"
-}
-
-void Fl::add_fd(int fd, void (*cb)(FL_SOCKET, void*), void* v) {
-# pragma message "FL_PORTING: implement Fl::add_fd"
-}
-
-void Fl::remove_fd(int n, int events) {
-# pragma message "FL_PORTING: implement Fl::remove_fd"
-}
-
-void Fl::remove_fd(int n) {
-# pragma message "FL_PORTING: implement Fl::remove_fd"
-}
-
-static void nothing() {}
-void (*fl_lock_function)() = nothing;
-void (*fl_unlock_function)() = nothing;
-
-//void* Fl::thread_message() {
-//# pragma message "FL_PORTING: implement Fl::thread_message"
-//}
-
-int fl_wait(double time_to_wait) {
-# pragma message "FL_PORTING: implement fl_wait"
- Fl::flush();
- return 0;
-}
-
-int fl_ready() {
-# pragma message "FL_PORTING: implement fl_ready"
- return 0;
-}
-
-void fl_open_display() {
-# pragma message "FL_PORTING: implement fl_open_display()"
-}
-
-void Fl::enable_im() {
-# pragma message "FL_PORTING: implement Fl::enable_im"
-}
-
-void Fl::disable_im() {
-# pragma message "FL_PORTING: implement Fl::disable_im"
-}
-
-int Fl::x()
-{
-# pragma message "FL_PORTING: implement Fl::x"
- return 0;
-}
-
-int Fl::y()
-{
-# pragma message "FL_PORTING: implement Fl::y"
- return 0;
-}
-
-int Fl::h()
-{
-# pragma message "FL_PORTING: implement Fl::h"
- return 600;
-}
-
-int Fl::w()
-{
-# pragma message "FL_PORTING: implement Fl::w"
- return 800;
-}
-
-char *fl_selection_buffer[2];
-int fl_selection_length[2];
-int fl_selection_buffer_length[2];
-char fl_i_own_selection[2];
-
-void fl_update_clipboard(void) {
-# pragma message "FL_PORTING: implement fl_update_clipboard"
-}
-
-// call this when you create a selection:
-void Fl::copy(const char *stuff, int len, int clipboard, const char *type) {
-# pragma message "FL_PORTING: implement Fl::copy"
-}
-
-// Call this when a "paste" operation happens:
-void Fl::paste(Fl_Widget &receiver, int clipboard, const char *type) {
-# pragma message "FL_PORTING: implement Fl::paste"
-}
-
-int Fl::clipboard_contains(const char *type)
-{
-# pragma message "FL_PORTING: implement Fl::clipboard_contains"
- return 0;
-}
-
-void fl_get_codepage()
-{
-# pragma message "FL_PORTING: implement fl_get_codepage"
-}
-
-int Fl_X::fake_X_wm(const Fl_Window* w,int &X,int &Y, int &bt,int &bx, int &by) {
-# pragma message "FL_PORTING: don't ask. We do't know either..."
- return 0;
-}
-
-void Fl_Window::resize(int X,int Y,int W,int H) {
-# pragma message "FL_PORTING: implement Fl_Window::resize"
-}
-
-//void Fl_X::make_fullscreen(int X, int Y, int W, int H) {
-//# pragma message "FL_PORTING: implement Fl_X::make_fullscreen"
-//}
-
-void Fl_Window::fullscreen_x() {
-# pragma message "FL_PORTING: implement Fl_Window::fullscreen_x"
-}
-
-void Fl_Window::fullscreen_off_x(int X, int Y, int W, int H) {
-# pragma message "FL_PORTING: implement Fl_Window::fullscreen_off_x"
-}
-
-void fl_fix_focus(); // in Fl.cxx
-
-char fl_show_iconic;
-int fl_disable_transient_for; // secret method of removing TRANSIENT_FOR
-
-Fl_X* Fl_X::make(Fl_Window* w) {
-# pragma message "FL_PORTING: implement Fl_X::make"
- return 0;
-}
-
-void Fl::add_timeout(double time, Fl_Timeout_Handler cb, void* data)
-{
-# pragma message "FL_PORTING: implement Fl::add_timeout"
-}
-
-void Fl::repeat_timeout(double time, Fl_Timeout_Handler cb, void* data)
-{
-# pragma message "FL_PORTING: implement Fl::repeat_timeout"
-}
-
-int Fl::has_timeout(Fl_Timeout_Handler cb, void* data)
-{
-# pragma message "FL_PORTING: implement Fl::has_timeout"
- return 0;
-}
-
-void Fl::remove_timeout(Fl_Timeout_Handler cb, void* data)
-{
-# pragma message "FL_PORTING: implement Fl::remove_timeout"
-}
-
-void Fl_Window::size_range_() {
- size_range_set = 1;
-}
-
-#include <FL/filename.H> // need so FL_EXPORT fl_filename_name works
-
-// returns pointer to the filename, or null if name ends with '/'
-const char *fl_filename_name(const char *name) {
-# pragma message "FL_PORTING: implement fl_filename_name"
- return 0;
-}
-
-void Fl_Window::label(const char *name,const char *iname) {
-# pragma message "FL_PORTING: implement Fl_Window::label"
-}
-
-void Fl_X::set_default_icons(const Fl_RGB_Image *icons[], int count) {
-# pragma message "FL_PORTING: implement Fl_X::set_defult_icons"
-}
-
-void Fl_X::set_icons() {
-# pragma message "FL_PORTING: implement Fl_X::set_icons"
-}
-
-int Fl_X::set_cursor(Fl_Cursor c) {
-# pragma message "FL_PORTING: implement Fl_X::set_cursor"
- return 1;
-}
-
-int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) {
-# pragma message "FL_PORTING: implement Fl_X::set_cursor"
- return 1;
-}
-
-void Fl_Window::show() {
-# pragma message "FL_PORTING: implement Fl_Window::show"
-}
-
-Fl_Window *Fl_Window::current_;
-
-void Fl_Window::make_current() {
-# pragma message "FL_PORTING: implement Fl_Window::make_current"
-}
-
-void fl_free_fonts(void)
-{
-# pragma message "FL_PORTING: implement fl_free_fonts"
-}
-
-
-//Fl_Region XRectangleRegion(int x, int y, int w, int h) {
-//}
-
-FL_EXPORT Window fl_xid_(const Fl_Window *w) {
- Fl_X *temp = Fl_X::i(w);
- return temp ? temp->xid : 0;
-}
-
-int Fl_Window::decorated_w()
-{
- return w();
-}
-
-int Fl_Window::decorated_h()
-{
- return h();
-}
-
-void Fl_Paged_Device::print_window(Fl_Window *win, int x_offset, int y_offset)
-{
-# pragma message "FL_PORTING: implement Fl_Paged_Device::print_window"
-}
-
-//void Fl_Paged_Device::draw_decorated_window(Fl_Window *win, int x_offset, int y_offset, Fl_Surface_Device *toset)
-//{
-//}
-
-Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data)
-{
-# pragma message "FL_PORTING: implement fl_create_bitmask"
- return 0;
-}
-
-//Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data)
-//{
-//# pragma message "FL_PORTING: implement fl_create_alphamask"
-// return 0;
-//}
-
-void fl_delete_bitmask(Fl_Bitmask bm)
-{
-# pragma message "FL_PORTING: implement fl_delete_bitmask"
-}
-
-Fl_Offscreen fl_create_offscreen(int w, int h)
-{
-# pragma message "FL_PORTING: implement fl_create_offscreen"
- return 0;
-}
-
-//void fl_copy_offscreen(int x,int y,int w,int h, Fl_Offscreen gWorld, int srcx,int srcy)
-//{
-//# pragma message "FL_PORTING: implement fl_copy_offscreen"
-//}
-
-void fl_delete_offscreen(Fl_Offscreen gWorld)
-{
-# pragma message "FL_PORTING: implement fl_delete_offscreen"
-}
-
-void fl_begin_offscreen(Fl_Offscreen gWorld)
-{
-# pragma message "FL_PORTING: implement fl_begin_offscreen"
-}
-
-void fl_end_offscreen()
-{
-# pragma message "FL_PORTING: implement fl_end_offscreen"
-}
-
-Fl_Font_Descriptor::~Fl_Font_Descriptor()
-{
-# pragma message "FL_PORTING: implement Fl_Font_Descriptor::~Fl_Font_Descriptor"
-}
-
-int Fl::dnd()
-{
-# pragma message "FL_PORTING: implement Fl::dnd"
- return 0;
-}
-
-void Fl::get_mouse(int &x, int &y)
-{
-# pragma message "FL_PORTING: implement Fl::get_mouse"
- x = 0; y = 0;
-}
-
-#endif // FL_DOXYGEN
-
-//
-// End of "$Id$".
-//
diff --git a/src/config_lib.h b/src/config_lib.h
index bef665b71..b4a80e918 100644
--- a/src/config_lib.h
+++ b/src/config_lib.h
@@ -25,8 +25,6 @@
# ifdef HAVE_GL
# define FL_CFG_GFX_OPENGL
# endif
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: please choose a core graphics library"
#elif defined(USE_X11) /* X11 */
# define FL_CFG_GFX_XLIB
# ifdef HAVE_GL
@@ -44,8 +42,6 @@
# define FL_CFG_PRN_QUARTZ
#elif defined(_WIN32)
# define FL_CFG_PRN_WIN32
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: please choose a printer driver"
#elif defined(USE_X11) /* X11 */
# define FL_CFG_PRN_PS
#endif
@@ -60,8 +56,6 @@
# define FL_CFG_WIN_COCOA
#elif defined(_WIN32)
# define FL_CFG_WIN_WIN32
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: please choose a window management library"
#elif defined(USE_X11) /* X11 */
# define FL_CFG_WIN_X11
#endif
@@ -76,8 +70,6 @@
# define FL_CFG_SYS_POSIX
#elif defined(_WIN32)
# define FL_CFG_SYS_WIN32
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: please choose a system library"
#elif defined(USE_X11) /* X11 */
# define FL_CFG_SYS_POSIX
#endif
diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
index 781e3be6e..fa9414ca3 100644
--- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
@@ -93,10 +93,6 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw,
#else
-#if defined(FL_PORTING)
-# pragma message "FL_PORTING: check whether the default Fl_OpenGL_Display_Device::capture_gl_rectangle() works for your platform"
-#endif
-
#include <FL/Fl_Screen_Driver.H>
#include <FL/Fl_Window_Driver.H>
Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window *glw, int x, int y, int w, int h)
diff --git a/src/drivers/Pico/Fl_Pico_Graphics_Driver.H b/src/drivers/Pico/Fl_Pico_Graphics_Driver.H
index e19d1fe13..c8eb0e678 100644
--- a/src/drivers/Pico/Fl_Pico_Graphics_Driver.H
+++ b/src/drivers/Pico/Fl_Pico_Graphics_Driver.H
@@ -81,7 +81,6 @@ class Fl_Pico_Graphics_Driver : public Fl_Graphics_Driver {
//#endif
// matrix *fl_matrix; /**< Points to the current coordinate transformation matrix */
//
-// // === all code below in this class has been to the reorganisation FL_PORTING process
//public:
// Fl_Graphics_Driver();
// virtual ~Fl_Graphics_Driver() { if (p) free(p); }
diff --git a/src/fl_call_main.c b/src/fl_call_main.c
index 6fa541a55..48bf9a801 100644
--- a/src/fl_call_main.c
+++ b/src/fl_call_main.c
@@ -37,12 +37,6 @@
* Microsoft(r) Windows(r) that allows for it.
*/
-#if defined(_WIN32) || defined(__APPLE__) /* PORTME: Fl_System_Driver - platform main() */
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: implement 'main()' here if your platform provides another app entry point"
-#else
-#endif
-
#if defined(_WIN32) && !defined(FL_DLL) && !defined (__GNUC__)
# include <windows.h>
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index 51920502a..91fabc0ab 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -32,9 +32,6 @@
*/
#include "config_lib.h"
-#if defined(FL_PORTING)
-# pragma message "FL_PORTING: implement OpenGL text rendering here"
-#endif // defined(FL_PORTING)
#if HAVE_GL || defined(FL_DOXYGEN)
diff --git a/src/xutf8/lcUniConv/cp936ext.h b/src/xutf8/lcUniConv/cp936ext.h
index e1a524d44..6c4763833 100644
--- a/src/xutf8/lcUniConv/cp936ext.h
+++ b/src/xutf8/lcUniConv/cp936ext.h
@@ -20,10 +20,6 @@
/* not needed */
-#elif defined(FL_PORTING)
-
-# pragma message "FL_PORTING: include the character encoding file below if needed"
-
#else
#ifndef CP936