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

Progress toward support of CMake OPTION_APPLE_SDL

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11673 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2016-04-20 04:49:36 +00:00
parent 747e88abdc
commit ae23f0cb5e
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Sys_Menu_Bar.H
+2 -10
View File
@@ -21,7 +21,7 @@
#include <FL/Fl_Menu_Bar.H> #include <FL/Fl_Menu_Bar.H>
#if defined(__APPLE__) || defined(FL_DOXYGEN) // PORTME: Fl_Screen_Driver - system menu bar #if defined(__APPLE__) || defined(FL_DOXYGEN)
/** /**
A class to create, modify and delete menus that appear on Mac OS X in the menu bar at the top of the screen. A class to create, modify and delete menus that appear on Mac OS X in the menu bar at the top of the screen.
@@ -92,19 +92,11 @@ public:
void setonly (Fl_Menu_Item *item) { Fl_Menu_::setonly(item); update(); } void setonly (Fl_Menu_Item *item) { Fl_Menu_::setonly(item); update(); }
}; };
#elif defined(WIN32)
typedef Fl_Menu_Bar Fl_Sys_Menu_Bar;
#elif defined(FL_PORTING)
# pragma message "FL_PORTING: define your own system menu class"
#else #else
typedef Fl_Menu_Bar Fl_Sys_Menu_Bar; typedef Fl_Menu_Bar Fl_Sys_Menu_Bar;
#endif // defined(__APPLE__) || defined(FL_DOXYGEN) // PORTME: Fl_Screen_Driver - system menu bar #endif // defined(__APPLE__) || defined(FL_DOXYGEN)
#endif // Fl_Sys_Menu_Bar_H #endif // Fl_Sys_Menu_Bar_H
src/Fl_Native_File_Chooser.cxx
+2 -1
View File
@@ -22,7 +22,8 @@
#ifdef FL_PORTING #ifdef FL_PORTING
# pragma message "Implement a native file chooser (see Fl_Native_File_Chooser_Driver), or use FLTK's chooser, or don't use any chooser" # pragma message "Implement a native file chooser (see Fl_Native_File_Chooser_Driver), or use FLTK's chooser, or don't use any chooser"
Fl_Native_File_Chooser::Fl_Native_File_Chooser(int val) { Fl_Native_File_Chooser::Fl_Native_File_Chooser(int val) {
platform_fnfc = new Fl_Native_File_Chooser_FLTK_Driver(val); //platform_fnfc = new Fl_Native_File_Chooser_FLTK_Driver(val); // do this to use FLTK's default file chooser
platform_fnfc = 0; // do this so class Fl_Native_File_Chooser does nothing
} }
#endif #endif
src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
+2 -1
View File
@@ -18,7 +18,7 @@
#include "../../config_lib.h" #include "../../config_lib.h"
#include "../../FL/Fl_System_Driver.H" #include <FL/Fl_System_Driver.H>
//#include "Fl_PicoSDL_System_Driver.h" //#include "Fl_PicoSDL_System_Driver.h"
@@ -31,6 +31,7 @@ Fl_System_Driver *Fl_System_Driver::newSystemDriver()
return new Fl_System_Driver(); return new Fl_System_Driver();
} }
void fl_open_callback(void (*cb)(const char *)) {}
// //
// End of "$Id: Fl_PicoSDL_System_Driver.cxx 11241 2016-02-27 13:52:27Z manolo $". // End of "$Id: Fl_PicoSDL_System_Driver.cxx 11241 2016-02-27 13:52:27Z manolo $".
test/image.cxx
+1 -1
View File
@@ -89,7 +89,7 @@ int arg(int argc, char **argv, int &i) {
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
#if !defined(WIN32) && !defined(__APPLE__) #if defined(USE_X11)
int i = 1; int i = 1;
Fl::args(argc,argv,i,arg); Fl::args(argc,argv,i,arg);