mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move PostScript-support files to src/drivers/PostScript/

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11222 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-02-26 15:24:08 +00:00
parent 53993d4bd1
commit cf4825eedf
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FL/Fl_PostScript.H
View File

@ -200,15 +200,7 @@ class Clip {
void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1); void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1);
void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); }; void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); };
#ifdef __APPLE__ // PORTME: merge into code - additional functionality
void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); }; void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); };
#elif defined(WIN32)
// not needed
#elif defined(FL_PORTING)
# pragma message "FL_PORTING: define floating point position text drawing if you have it"
#else // X11
// not needed
#endif
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* s, int n, int x, int y); void rtl_draw(const char* s, int n, int x, int y);
void font(int face, int size); void font(int face, int size);

4
src/CMakeLists.txt
View File

@ -157,8 +157,8 @@ if (USE_X11 AND NOT OPTION_PRINT_SUPPORT)
) )
else() else()
set(PSFILES set(PSFILES
Fl_PostScript.cxx drivers/PostScript/Fl_PostScript.cxx
ps_image.cxx drivers/PostScript/Fl_PostScript_image.cxx
) )
endif(USE_X11 AND NOT OPTION_PRINT_SUPPORT) endif(USE_X11 AND NOT OPTION_PRINT_SUPPORT)

5
src/Makefile
View File

@ -271,11 +271,16 @@ GDICPPFILES = \
drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx \ drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx \
drivers/WinAPI/Fl_WinAPI_System_Driver.cxx drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
PSCPPFILES = \
drivers/PostScript/Fl_PostScript.cxx \
drivers/PostScript/Fl_PostScript_image.cxx
################################################################ ################################################################
FLTKFLAGS = -DFL_LIBRARY FLTKFLAGS = -DFL_LIBRARY
include ../makeinclude include ../makeinclude
MMFILES = $(shell if test $(USEMMFILES) = Yes; then echo $(OBJCPPFILES); fi) MMFILES = $(shell if test $(USEMMFILES) = Yes; then echo $(OBJCPPFILES); fi)
CPPFILES += $(PSCPPFILES)
CPPFILES += $(shell if test $(USEMMFILES) = Yes; then echo $(QUARTZCPPFILES); fi) CPPFILES += $(shell if test $(USEMMFILES) = Yes; then echo $(QUARTZCPPFILES); fi)
CPPFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCPPFILES); fi) CPPFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCPPFILES); fi)

2
src/Fl_PostScript.cxx → src/drivers/PostScript/Fl_PostScript.cxx
View File

@ -172,7 +172,7 @@ int Fl_PostScript_Graphics_Driver::clocale_printf(const char *format, ...)
#ifndef FL_DOXYGEN #ifndef FL_DOXYGEN
#if ! (defined(__APPLE__) || defined(WIN32) ) // PORTME: Fl_Surface_Driver - platform PostScript #if ! (defined(__APPLE__) || defined(WIN32) ) // PORTME: Fl_Surface_Driver - platform PostScript
# include "print_panel.cxx" # include <src/print_panel.cxx>
#endif #endif
// Prolog string // Prolog string

0
src/ps_image.cxx → src/drivers/PostScript/Fl_PostScript_image.cxx
View File