diff options
| author | Greg Ercolano <erco@seriss.com> | 2013-09-21 16:41:23 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2013-09-21 16:41:23 +0000 |
| commit | 2082d7e1978952138155be7dce29f20004bd71a5 (patch) | |
| tree | 0c64cec27ca635de750158a18715cf39d482bfa7 /FL | |
| parent | 2fc6c3a39b6be6f8a6b9a9dd1d030b46d7ea71bf (diff) | |
Fixes STR# 2973: collection of Sun compiler fixes.
Applied str_2973_r9979_sun-fix-warnings-7.patch (with small mods)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9980 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_PostScript.H | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H index b1ec3baae..347264909 100644 --- a/FL/Fl_PostScript.H +++ b/FL/Fl_PostScript.H @@ -52,6 +52,12 @@ <br> All other unicode characters or all other fonts (FL_FREE_FONT and above) are output as a bitmap. <br> FLTK standard fonts are output using the corresponding PostScript standard fonts. */ + +/** Signature of Fl_PostScript::close_command() functions passed as parameters. */ +extern "C" { + typedef int (Fl_PostScript_Close_Command)(FILE *); +} + class FL_EXPORT Fl_PostScript_Graphics_Driver : public Fl_Graphics_Driver { public: static const char *class_id; @@ -89,7 +95,7 @@ class Clip { int mx; // width of mask; int my; // mask lines //Fl_Color bg_; - int (*close_cmd_)(FILE *); + Fl_PostScript_Close_Command* close_cmd_; int page_policy_; int nPages; int orientation_; @@ -116,7 +122,11 @@ class Clip { void page_policy(int p); int page_policy(){return page_policy_;}; +#if FLTK_ABI_VERSION < 10303 void close_command( int (*cmd)(FILE *)){close_cmd_=cmd;}; +#else + void close_command(Fl_PostScript_Close_Command* cmd){close_cmd_=cmd;}; +#endif FILE * file() {return output;}; //void orientation (int o); //Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int pages = 0); // ps (also multi-page) constructor |