Integrated Darrell's Mac OS X print code into src/tuxpaint.c
This commit is contained in:
parent
f4aee97f43
commit
ef12aa7256
2 changed files with 22 additions and 3 deletions
|
|
@ -7,7 +7,11 @@ bill@newbreedsoftware.com
|
||||||
http://www.newbreedsoftware.com/tuxpaint/
|
http://www.newbreedsoftware.com/tuxpaint/
|
||||||
|
|
||||||
|
|
||||||
2003.April.25 (0.9.11) [cvs]
|
2003.May.8 (0.9.11) [cvs]
|
||||||
|
* Mac OS X print update. Get to a print dialog by holding Alt/Option when
|
||||||
|
clicking "Print." (Similar to how Windows handles it.)
|
||||||
|
Darrell Walisser <walisser@mac.com>
|
||||||
|
|
||||||
* Hebrew translation!
|
* Hebrew translation!
|
||||||
Dovix <dovix2003@yahoo.com>
|
Dovix <dovix2003@yahoo.com>
|
||||||
Koby <kobybo@hotmail.com>
|
Koby <kobybo@hotmail.com>
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,9 @@
|
||||||
#ifdef __BEOS__
|
#ifdef __BEOS__
|
||||||
#include "BeOS_print.h"
|
#include "BeOS_print.h"
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __APPLE__
|
||||||
|
#include "maxosx_print.h"
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
#include "win32_dirent.h"
|
#include "win32_dirent.h"
|
||||||
#include "win32_print.h"
|
#include "win32_print.h"
|
||||||
|
|
@ -9821,7 +9824,7 @@ void show_progress_bar(void)
|
||||||
|
|
||||||
void do_print(void)
|
void do_print(void)
|
||||||
{
|
{
|
||||||
#if !defined(WIN32) && !defined(__BEOS__)
|
#if !defined(WIN32) && !defined(__BEOS__) && !defined(__APPLE__)
|
||||||
/* Linux, Unix, etc. */
|
/* Linux, Unix, etc. */
|
||||||
|
|
||||||
FILE * pi;
|
FILE * pi;
|
||||||
|
|
@ -9847,11 +9850,23 @@ void do_print(void)
|
||||||
|
|
||||||
snprintf(f, sizeof(f), "%s/%s", savedir, "print.cfg");
|
snprintf(f, sizeof(f), "%s/%s", savedir, "print.cfg");
|
||||||
SurfacePrint(canvas, use_print_config?f:NULL, show);
|
SurfacePrint(canvas, use_print_config?f:NULL, show);
|
||||||
#else
|
#elif defined(__BEOS__)
|
||||||
/* BeOS */
|
/* BeOS */
|
||||||
|
|
||||||
SurfacePrint(canvas);
|
SurfacePrint(canvas);
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
/* Mac OS X */
|
||||||
|
|
||||||
|
int show = (SDL_GetModState() & KMOD_ALT) && !fullscreen;
|
||||||
|
|
||||||
|
const char* error = SurfacePrint (canvas, show);
|
||||||
|
|
||||||
|
if (error)
|
||||||
|
fprintf (stderr, "Cannot print: %s\n", error);
|
||||||
|
else
|
||||||
|
do_prompt (PROMPT_PRINT_TXT, PROMPT_PRINT_YES, "");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue