Progress toward support of CMake OPTION_APPLE_SDL

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11673 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 7 insertions, 13 deletions

diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H
index bb99f6af7..3f7344e15 100644
--- a/FL/Fl_Sys_Menu_Bar.H
+++ b/FL/Fl_Sys_Menu_Bar.H
@@ -21,7 +21,7 @@
 
 #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.
@@ -92,19 +92,11 @@ public:
   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
 
 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
 
diff --git a/src/Fl_Native_File_Chooser.cxx b/src/Fl_Native_File_Chooser.cxx
index 77000c887..b42a331b5 100644
--- a/src/Fl_Native_File_Chooser.cxx
+++ b/src/Fl_Native_File_Chooser.cxx
@@ -22,7 +22,8 @@
 #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"
 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
 
diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
index 6122ff5f1..47cbe81a5 100644
--- a/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
@@ -18,7 +18,7 @@
 
 
 #include "../../config_lib.h"
-#include "../../FL/Fl_System_Driver.H"
+#include <FL/Fl_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();
 }
 
+void fl_open_callback(void (*cb)(const char *)) {}
 
 //
 // End of "$Id: Fl_PicoSDL_System_Driver.cxx 11241 2016-02-27 13:52:27Z manolo $".
diff --git a/test/image.cxx b/test/image.cxx
index 422566c3f..3c0b1f6b3 100644
--- a/test/image.cxx
+++ b/test/image.cxx
@@ -89,7 +89,7 @@ int arg(int argc, char **argv, int &i) {
 }
 
 int main(int argc, char **argv) {
-#if !defined(WIN32) && !defined(__APPLE__)
+#if defined(USE_X11)
   int i = 1;
 
   Fl::args(argc,argv,i,arg);