mirror of
https://github.com/fltk/fltk.git
synced 2026-06-05 08:06:35 +08:00
Fixed for Linux
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
+1
-1
@@ -119,6 +119,7 @@ class FL_EXPORT Fl_Graphics_Driver : public Fl_Device {
|
|||||||
public:
|
public:
|
||||||
/** A 2D coordinate transformation matrix */
|
/** A 2D coordinate transformation matrix */
|
||||||
struct matrix {double a, b, c, d, x, y;};
|
struct matrix {double a, b, c, d, x, y;};
|
||||||
|
int fl_clip_state_number;
|
||||||
protected:
|
protected:
|
||||||
static const matrix m0;
|
static const matrix m0;
|
||||||
Fl_Font font_; // current font
|
Fl_Font font_; // current font
|
||||||
@@ -131,7 +132,6 @@ protected:
|
|||||||
int n, p_size, gap_;
|
int n, p_size, gap_;
|
||||||
XPOINT *p;
|
XPOINT *p;
|
||||||
int what;
|
int what;
|
||||||
int fl_clip_state_number;
|
|
||||||
int rstackptr;
|
int rstackptr;
|
||||||
static const int region_stack_max = FL_REGION_STACK_SIZE - 1;
|
static const int region_stack_max = FL_REGION_STACK_SIZE - 1;
|
||||||
Fl_Region rstack[FL_REGION_STACK_SIZE];
|
Fl_Region rstack[FL_REGION_STACK_SIZE];
|
||||||
|
|||||||
+1
-1
@@ -497,7 +497,7 @@ Fl_cocoa.o: Fl_cocoa.mm
|
|||||||
fl_color.o:
|
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_x.cxx fl_font_xft.cxx fl_font_win32.cxx
|
||||||
fl_read_image.o: fl_read_image_mac.cxx fl_read_image_win32.cxx
|
fl_read_image.o: fl_read_image_mac.cxx fl_read_image_win32.cxx
|
||||||
fl_set_fonts.o: fl_set_fonts_mac.cxx fl_set_fonts_x.cxx \
|
fl_set_fonts.o: fl_set_fonts_mac.cxx fl_set_fonts_x.cxx \
|
||||||
fl_set_fonts_xft.cxx fl_set_fonts_win32.cxx
|
fl_set_fonts_xft.cxx fl_set_fonts_win32.cxx
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ void Fl_OpenGL_Graphics_Driver::draw(const char *str, int n, int x, int y)
|
|||||||
const char *fd = font_data[(int)c];
|
const char *fd = font_data[(int)c];
|
||||||
if (fd) {
|
if (fd) {
|
||||||
char rendering = 0;
|
char rendering = 0;
|
||||||
float px, py;
|
float px=0.0f, py=0.0f;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
char cmd = *fd++;
|
char cmd = *fd++;
|
||||||
if (cmd==0) {
|
if (cmd==0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user