Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-31 13:55:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Now compiles with GCC3 and 4.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7270 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2010-03-15 15:57:48 +00:00
parent 41ee53fd34
commit 1c904d452b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+6 -4
View File
@@ -90,7 +90,6 @@ extern "C" {
} }
#include <FL/Fl_Device.H>
#include <FL/Fl.H> #include <FL/Fl.H>
#include <FL/x.H> #include <FL/x.H>
#include <FL/Fl_Window.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 // 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++ // that's illegal under GCC 3 -x -objective-c++
#define id id_ #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 #endif
#include <FL/Fl_Sys_Menu_Bar.H> #include <FL/Fl_Sys_Menu_Bar.H>
#include <FL/Fl_Printer.H>
#ifdef id #ifdef id
#undef id #undef id
#endif #endif
@@ -2985,11 +2988,10 @@ int MACscreen_init(XRectangle screens[])
nil]; nil];
[NSApp orderFrontStandardAboutPanelWithOptions:options]; [NSApp orderFrontStandardAboutPanelWithOptions:options];
} }
#include <FL/Fl_Printer.H>
- (void)printPanel - (void)printPanel
{ {
Fl_Printer printer; Fl_Printer printer;
// Fl_PSfile_Device printer; //Fl_PSfile_Device printer;
int w, h; int w, h;
Fl_Window *win = Fl::first_window(); Fl_Window *win = Fl::first_window();
if(!win) return; if(!win) return;
@@ -3040,7 +3042,7 @@ static void createAppleMenu(void)
[menuItem setTarget:about]; [menuItem setTarget:about];
[appleMenu addItem:[NSMenuItem separatorItem]]; [appleMenu addItem:[NSMenuItem separatorItem]];
// temporary for testing Fl_Printer. Contains also printPanel of class FLaboutItemTarget. // 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]; [menuItem setTarget:about];
[appleMenu setAutoenablesItems:NO]; [appleMenu setAutoenablesItems:NO];
[menuItem setEnabled:YES]; [menuItem setEnabled:YES];