Author: manolo
Date: 2010-03-15 08:57:48 -0700 (Mon, 15 Mar 2010)
New Revision: 7270
Log:
Now compiles with GCC3 and 4.
Modified:
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2010-03-15 09:31:10 UTC (rev 7269)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2010-03-15 15:57:48 UTC (rev 7270)
@@ -90,7 +90,6 @@
}
-#include <FL/Fl_Device.H>
#include <FL/Fl.H>
#include <FL/x.H>
#include <FL/Fl_Window.H>
@@ -99,8 +98,12 @@
// 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 @@
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 @@
[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];
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
