Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:32:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes for Unix/X11

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11046 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2016-01-24 16:34:59 +00:00
parent 60ec452d04
commit 21ae726ba4
7 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+1 -1
View File
@@ -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_Native_File_Chooser_MAC.o: Fl_Native_File_Chooser_MAC.mm
Fl.o: Fl_win32.cxx Fl.o: Fl_win32.cxx
Fl_cocoa.o: Fl_cocoa.mm 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_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_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 fl_font.o: fl_font_mac.cxx fl_font_x.cxx fl_font_xft.cxx fl_font_win32.cxx
src/cfg_gfx/gdi.H
+1 -2
View File
@@ -40,8 +40,6 @@ protected:
public: public:
static const char *class_id; static const char *class_id;
const char *class_name() {return 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(const char* str, int n, int x, int y);
void draw(int angle, 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); 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); 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 // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx
void color(Fl_Color c); void color(Fl_Color c);
Fl_Color color() { return color_; }
void color(uchar r, uchar g, uchar b); void color(uchar r, uchar g, uchar b);
}; };
src/cfg_gfx/opengl.H
+1
View File
@@ -84,6 +84,7 @@ public:
void line_style(int style, int width=0, char* dashes=0); 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 // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx
void color(Fl_Color c); void color(Fl_Color c);
Fl_Color color() { return color_; }
void color(uchar r, uchar g, uchar b); void color(uchar r, uchar g, uchar b);
}; };
src/cfg_gfx/opengl_arci.cxx
+1
View File
@@ -25,6 +25,7 @@
*/ */
#include <FL/gl.h> #include <FL/gl.h>
#include <math.h>
void Fl_OpenGL_Graphics_Driver::arc(int x,int y,int w,int h,double a1,double a2) { void Fl_OpenGL_Graphics_Driver::arc(int x,int y,int w,int h,double a1,double a2) {
if (w <= 0 || h <= 0) return; if (w <= 0 || h <= 0) return;
src/cfg_gfx/quartz.H
+1 -2
View File
@@ -43,8 +43,6 @@ class FL_EXPORT Fl_Quartz_Graphics_Driver : public Fl_Graphics_Driver {
public: public:
static const char *class_id; static const char *class_id;
const char *class_name() {return 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(const char* str, int n, int x, int y);
#ifdef __APPLE__ #ifdef __APPLE__
void draw(const char *str, int n, float x, float y); 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); 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 // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx
void color(Fl_Color c); void color(Fl_Color c);
Fl_Color color() { return color_; }
void color(uchar r, uchar g, uchar b); void color(uchar r, uchar g, uchar b);
}; };
src/cfg_gfx/xlib.H
+1 -2
View File
@@ -36,8 +36,6 @@ class FL_EXPORT Fl_Xlib_Graphics_Driver : public Fl_Graphics_Driver {
public: public:
static const char *class_id; static const char *class_id;
const char *class_name() {return 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(const char* str, int n, int x, int y);
void draw(int angle, 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); 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); 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 // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx
void color(Fl_Color c); void color(Fl_Color c);
Fl_Color color() { return color_; }
void color(uchar r, uchar g, uchar b); void color(uchar r, uchar g, uchar b);
}; };
src/cfg_gfx/xlib_color.cxx
+2 -2
View File
@@ -31,7 +31,7 @@
// being used to index arrays. So I always copy them to an integer // being used to index arrays. So I always copy them to an integer
// before use. // before use.
# include "Fl_XColor.H" # include "../Fl_XColor.H"
# include <FL/Fl.H> # include <FL/Fl.H>
# include <FL/x.H> # include <FL/x.H>
# include <FL/fl_draw.H> # include <FL/fl_draw.H>
@@ -92,7 +92,7 @@ static void figure_out_visual() {
} }
static unsigned fl_cmap[256] = { 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 # if HAVE_OVERLAY