diff options
| author | Manolo Gouy <Manolo> | 2016-02-26 15:24:08 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-02-26 15:24:08 +0000 |
| commit | cf4825eedf9ee529cd99e8b99b69cdd3ec6ffb69 (patch) | |
| tree | 147599508534f4db9a34b439ba6c0611e07094a2 | |
| parent | 53993d4bd1476e6d7700b13a2ca0e1d489a740d4 (diff) | |
Move PostScript-support files to src/drivers/PostScript/
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11222 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_PostScript.H | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript.cxx (renamed from src/Fl_PostScript.cxx) | 2 | ||||
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript_image.cxx (renamed from src/ps_image.cxx) | 0 |
5 files changed, 8 insertions, 11 deletions
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H index fbb2b78c4..19e59feb6 100644 --- a/FL/Fl_PostScript.H +++ b/FL/Fl_PostScript.H @@ -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(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); }; -#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 rtl_draw(const char* s, int n, int x, int y); void font(int face, int size); diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 827394b5e..c1e5e7a3f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -157,8 +157,8 @@ if (USE_X11 AND NOT OPTION_PRINT_SUPPORT) ) else() set(PSFILES - Fl_PostScript.cxx - ps_image.cxx + drivers/PostScript/Fl_PostScript.cxx + drivers/PostScript/Fl_PostScript_image.cxx ) endif(USE_X11 AND NOT OPTION_PRINT_SUPPORT) diff --git a/src/Makefile b/src/Makefile index e03e29bcf..9c168400d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -271,11 +271,16 @@ GDICPPFILES = \ drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx \ drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +PSCPPFILES = \ + drivers/PostScript/Fl_PostScript.cxx \ + drivers/PostScript/Fl_PostScript_image.cxx + ################################################################ FLTKFLAGS = -DFL_LIBRARY include ../makeinclude 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 $(BUILD_X11) = Yes; then echo $(XLIBCPPFILES); fi) diff --git a/src/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx index 6ff365706..465ed90f2 100644 --- a/src/Fl_PostScript.cxx +++ b/src/drivers/PostScript/Fl_PostScript.cxx @@ -172,7 +172,7 @@ int Fl_PostScript_Graphics_Driver::clocale_printf(const char *format, ...) #ifndef FL_DOXYGEN #if ! (defined(__APPLE__) || defined(WIN32) ) // PORTME: Fl_Surface_Driver - platform PostScript -# include "print_panel.cxx" +# include <src/print_panel.cxx> #endif // Prolog string diff --git a/src/ps_image.cxx b/src/drivers/PostScript/Fl_PostScript_image.cxx index f6a118485..f6a118485 100644 --- a/src/ps_image.cxx +++ b/src/drivers/PostScript/Fl_PostScript_image.cxx |