From 21ae726ba461f3979d4fc6dd09ef582a99f84225 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sun, 24 Jan 2016 16:34:59 +0000 Subject: Fixes for Unix/X11 git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11046 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Makefile | 2 +- src/cfg_gfx/gdi.H | 3 +-- src/cfg_gfx/opengl.H | 1 + src/cfg_gfx/opengl_arci.cxx | 1 + src/cfg_gfx/quartz.H | 3 +-- src/cfg_gfx/xlib.H | 3 +-- src/cfg_gfx/xlib_color.cxx | 4 ++-- 7 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 7deca32a1..c682b9c3a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -494,7 +494,7 @@ Fl_Native_File_Chooser.o : Fl_Native_File_Chooser_WIN32.cxx Fl_Native_File_Chooser_MAC.o: Fl_Native_File_Chooser_MAC.mm Fl.o: Fl_win32.cxx Fl_cocoa.o: Fl_cocoa.mm -fl_color.o: fl_color_mac.cxx fl_color_win32.cxx +fl_color.o: fl_dnd.o: fl_dnd_win32.cxx fl_dnd_x.cxx fl_draw_image.o: fl_draw_image_mac.cxx fl_draw_image_win32.cxx fl_font.o: fl_font_mac.cxx fl_font_x.cxx fl_font_xft.cxx fl_font_win32.cxx diff --git a/src/cfg_gfx/gdi.H b/src/cfg_gfx/gdi.H index 1c70e2277..c38b23a5c 100644 --- a/src/cfg_gfx/gdi.H +++ b/src/cfg_gfx/gdi.H @@ -40,8 +40,6 @@ protected: public: static const char *class_id; const char *class_name() {return class_id;}; - void color(Fl_Color c); - void color(uchar r, uchar g, uchar b); void draw(const char* str, int n, int x, int y); void draw(int angle, const char *str, int n, int x, int y); void rtl_draw(const char* str, int n, int x, int y); @@ -106,6 +104,7 @@ protected: void line_style(int style, int width=0, char* dashes=0); // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx void color(Fl_Color c); + Fl_Color color() { return color_; } void color(uchar r, uchar g, uchar b); }; diff --git a/src/cfg_gfx/opengl.H b/src/cfg_gfx/opengl.H index 8987e9e37..dc25d32ec 100644 --- a/src/cfg_gfx/opengl.H +++ b/src/cfg_gfx/opengl.H @@ -84,6 +84,7 @@ public: void line_style(int style, int width=0, char* dashes=0); // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx void color(Fl_Color c); + Fl_Color color() { return color_; } void color(uchar r, uchar g, uchar b); }; diff --git a/src/cfg_gfx/opengl_arci.cxx b/src/cfg_gfx/opengl_arci.cxx index dcd47971a..f925d9c78 100644 --- a/src/cfg_gfx/opengl_arci.cxx +++ b/src/cfg_gfx/opengl_arci.cxx @@ -25,6 +25,7 @@ */ #include +#include void Fl_OpenGL_Graphics_Driver::arc(int x,int y,int w,int h,double a1,double a2) { if (w <= 0 || h <= 0) return; diff --git a/src/cfg_gfx/quartz.H b/src/cfg_gfx/quartz.H index a85f200c1..6a6c5f337 100644 --- a/src/cfg_gfx/quartz.H +++ b/src/cfg_gfx/quartz.H @@ -43,8 +43,6 @@ class FL_EXPORT Fl_Quartz_Graphics_Driver : public Fl_Graphics_Driver { public: static const char *class_id; const char *class_name() {return class_id;}; -// void color(Fl_Color c); -// void color(uchar r, uchar g, uchar b); void draw(const char* str, int n, int x, int y); #ifdef __APPLE__ void draw(const char *str, int n, float x, float y); @@ -113,6 +111,7 @@ protected: void line_style(int style, int width=0, char* dashes=0); // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx void color(Fl_Color c); + Fl_Color color() { return color_; } void color(uchar r, uchar g, uchar b); }; diff --git a/src/cfg_gfx/xlib.H b/src/cfg_gfx/xlib.H index c0102a726..4ce00b426 100644 --- a/src/cfg_gfx/xlib.H +++ b/src/cfg_gfx/xlib.H @@ -36,8 +36,6 @@ class FL_EXPORT Fl_Xlib_Graphics_Driver : public Fl_Graphics_Driver { public: static const char *class_id; const char *class_name() {return class_id;}; - void color(Fl_Color c); - void color(uchar r, uchar g, uchar b); void draw(const char* str, int n, int x, int y); void draw(int angle, const char *str, int n, int x, int y); void rtl_draw(const char* str, int n, int x, int y); @@ -102,6 +100,7 @@ protected: void line_style(int style, int width=0, char* dashes=0); // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx void color(Fl_Color c); + Fl_Color color() { return color_; } void color(uchar r, uchar g, uchar b); }; diff --git a/src/cfg_gfx/xlib_color.cxx b/src/cfg_gfx/xlib_color.cxx index f7e1ac5e6..e7e9d0cf7 100644 --- a/src/cfg_gfx/xlib_color.cxx +++ b/src/cfg_gfx/xlib_color.cxx @@ -31,7 +31,7 @@ // being used to index arrays. So I always copy them to an integer // before use. -# include "Fl_XColor.H" +# include "../Fl_XColor.H" # include # include # include @@ -92,7 +92,7 @@ static void figure_out_visual() { } static unsigned fl_cmap[256] = { -#include "fl_cmap.h" // this is a file produced by "cmap.cxx": +#include "../fl_cmap.h" // this is a file produced by "cmap.cxx": }; # if HAVE_OVERLAY -- cgit v1.2.3