diff options
| author | Manolo Gouy <Manolo> | 2010-03-15 15:57:48 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-03-15 15:57:48 +0000 |
| commit | 1c904d452b86cb0c7841a6ef4468a26c8526e760 (patch) | |
| tree | 6680da6a1d32217002eec1782b0ac5efcb602d0f /src | |
| parent | 41ee53fd3489f2c6738dd38cba9c9545e7bb72c7 (diff) | |
Now compiles with GCC3 and 4.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7270 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_cocoa.mm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index adda86b0f..5c7f65998 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -90,7 +90,6 @@ extern "C" { } -#include <FL/Fl_Device.H> #include <FL/Fl.H> #include <FL/x.H> #include <FL/Fl_Window.H> @@ -99,8 +98,12 @@ extern "C" { // because Fl_Image.H, included by Fl_Sys_Menu_Bar.H, uses a private variable name id // that's illegal under GCC 3 -x -objective-c++ #define id id_ +// because Fl_Bitmap.H and Fl_Pixmap.H included by Fl_Printer.H don't compile with gcc3 and objective-c++ +#define Fl_Bitmap_H +#define Fl_Pixmap_H #endif #include <FL/Fl_Sys_Menu_Bar.H> +#include <FL/Fl_Printer.H> #ifdef id #undef id #endif @@ -2985,11 +2988,10 @@ int MACscreen_init(XRectangle screens[]) nil]; [NSApp orderFrontStandardAboutPanelWithOptions:options]; } -#include <FL/Fl_Printer.H> - (void)printPanel { Fl_Printer printer; -// Fl_PSfile_Device printer; + //Fl_PSfile_Device printer; int w, h; Fl_Window *win = Fl::first_window(); if(!win) return; @@ -3040,7 +3042,7 @@ static void createAppleMenu(void) [menuItem setTarget:about]; [appleMenu addItem:[NSMenuItem separatorItem]]; // temporary for testing Fl_Printer. Contains also printPanel of class FLaboutItemTarget. - menuItem = [appleMenu addItemWithTitle:@"Print front window" action:@selector(printPanel) keyEquivalent:@"p"]; + menuItem = [appleMenu addItemWithTitle:@"Print front window" action:@selector(printPanel) keyEquivalent:@""]; [menuItem setTarget:about]; [appleMenu setAutoenablesItems:NO]; [menuItem setEnabled:YES]; |