diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-01-24 21:06:21 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-01-24 21:06:21 +0000 |
| commit | 12e85b882aedccfae4836dd8c72bd546e1be408e (patch) | |
| tree | 2fdae63ad6205a0fd96660d104e0ea4b00a8e54b | |
| parent | 6a12d167508ec8fb8747e480a12813dbef421586 (diff) | |
Fixed for Linux
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Device.H | 2 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/cfg_gfx/opengl_font.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index 5e9354608..d7b7ede7c 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -119,6 +119,7 @@ class FL_EXPORT Fl_Graphics_Driver : public Fl_Device { public: /** A 2D coordinate transformation matrix */ struct matrix {double a, b, c, d, x, y;}; + int fl_clip_state_number; protected: static const matrix m0; Fl_Font font_; // current font @@ -131,7 +132,6 @@ protected: int n, p_size, gap_; XPOINT *p; int what; - int fl_clip_state_number; int rstackptr; static const int region_stack_max = FL_REGION_STACK_SIZE - 1; Fl_Region rstack[FL_REGION_STACK_SIZE]; diff --git a/src/Makefile b/src/Makefile index c682b9c3a..a44c41152 100644 --- a/src/Makefile +++ b/src/Makefile @@ -497,7 +497,7 @@ Fl_cocoa.o: Fl_cocoa.mm 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 +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_set_fonts.o: fl_set_fonts_mac.cxx fl_set_fonts_x.cxx \ fl_set_fonts_xft.cxx fl_set_fonts_win32.cxx diff --git a/src/cfg_gfx/opengl_font.cxx b/src/cfg_gfx/opengl_font.cxx index a42b92394..18c0c2b77 100644 --- a/src/cfg_gfx/opengl_font.cxx +++ b/src/cfg_gfx/opengl_font.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]; if (fd) { char rendering = 0; - float px, py; + float px=0.0f, py=0.0f; for (;;) { char cmd = *fd++; if (cmd==0) { |