diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-01-26 21:31:59 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-01-26 21:31:59 +0000 |
| commit | 034a4f3f2a15302b1a1ea3df6033cbffdc7b7418 (patch) | |
| tree | e0dfd3e7439726cd4e1125321b28fade6e013230 /src | |
| parent | 6694780c2d02d645f053fd60864c9ff035296a64 (diff) | |
Made GDI compilation work again
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11059 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver.h | 6 | ||||
| -rw-r--r-- | src/fl_color.cxx | 1 | ||||
| -rw-r--r-- | src/fl_line_style.cxx | 2 | ||||
| -rw-r--r-- | src/fl_set_fonts.cxx | 6 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.h b/src/drivers/GDI/Fl_GDI_Graphics_Driver.h index c38b23a5c..61dc888f2 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.h +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.h @@ -22,8 +22,8 @@ \brief Definition of MSWindows GDI graphics driver. */ -#ifndef FL_CFG_GFX_GDI_H -#define FL_CFG_GFX_GDI_H +#ifndef FL_GDI_GRAPHICS_DRIVER_H +#define FL_GDI_GRAPHICS_DRIVER_H #include <FL/Fl_Device.H> @@ -109,7 +109,7 @@ protected: }; -#endif // FL_CFG_GFX_GDI_H +#endif // FL_GDI_GRAPHICS_DRIVER_H // // End of "$Id$". diff --git a/src/fl_color.cxx b/src/fl_color.cxx index 887ae8a27..c4ab6e869 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -23,6 +23,7 @@ // Implementation of fl_color(i), fl_color(r,g,b). +#include <FL/Fl_Device.H> #include <config.h> #include "config_lib.h" diff --git a/src/fl_line_style.cxx b/src/fl_line_style.cxx index 965fb5a9e..15a4ba1c5 100644 --- a/src/fl_line_style.cxx +++ b/src/fl_line_style.cxx @@ -50,7 +50,7 @@ int fl_line_width_ = 0; #ifdef FL_CFG_GFX_GDI -# include "drivers/GDI/Fl_GDI_Graphics_Driver_style.cxx" +# include "drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx" #endif diff --git a/src/fl_set_fonts.cxx b/src/fl_set_fonts.cxx index 4a83768e7..8118619a6 100644 --- a/src/fl_set_fonts.cxx +++ b/src/fl_set_fonts.cxx @@ -23,9 +23,11 @@ #include <stdlib.h> #ifdef WIN32 -# include "fl_set_fonts_win32.cxx" +//# include "fl_set_fonts_win32.cxx" +// now included for fl_font.cxx, but will be its own source code module in drivers/Xlib/Fl_Xlib_Graphics_Driver_font..." #elif defined(__APPLE__) -# include "fl_set_fonts_mac.cxx" +//# include "fl_set_fonts_mac.cxx" +// now included for fl_font.cxx, but will be its own source code module in drivers/Xlib/Fl_Xlib_Graphics_Driver_font..." #elif USE_XFT //# include "fl_set_fonts_xft.cxx" // now included for fl_font.cxx, but will be its own source code module in drivers/Xlib/Fl_Xlib_Graphics_Driver_font..." |