Cleaning Pico

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11670 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Apr 19, 2016 · f45389d · f45389d
1 parent d40b765
commit f45389d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 45 deletions.
diff --git a/FL/porting.H b/FL/porting.H
@@ -45,27 +45,6 @@ struct XRectangle {int x, y, width, height;};
 
 inline void fl_open_callback(void (*)(const char *)) {}
 
-// This object contains all platform-specific stuff about a window:
-// WARNING: this object is highly subject to change!
-//class Fl_X {
-//public:
-//  Window xid;              // pointer to the native window object (FLWindow*)
-//  Fl_Offscreen other_xid;  // pointer for offscreen bitmaps (overlay window)
-//  Fl_Window *w;            // FLTK window for
-//  Fl_Region region;
-//  Fl_X *next;              // chain of mapped windows
-//  int wait_for_expose;
-//  static Fl_X* first;
-//  static Fl_X* i(const Fl_Window* w) {return w->i;}
-//  static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&);
-//  static Fl_X* make(Fl_Window*);
-//  void flush();
-//  static void set_default_icons(const Fl_RGB_Image*[], int);
-//  void set_icons();
-//  int set_cursor(Fl_Cursor);
-//  int set_cursor(const Fl_RGB_Image*, int, int);
-//};
-
 extern Window fl_window;
 
 #endif // FL_LIBRARY || FL_INTERNALS

diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx
@@ -28,6 +28,10 @@
 #undef __APPLE__
 
 
+// FIXME: does that have to be here?
+Window fl_window;
+
+
 Fl_Screen_Driver* Fl_Screen_Driver::newScreenDriver()
 {
   return new Fl_PicoSDL_Screen_Driver();
@@ -133,30 +137,6 @@ double Fl_PicoSDL_Screen_Driver::wait(double time_to_wait)
 }
 
 
-// FIXME: remove the stuff below
-
-#include <FL/x.H>
-#include <FL/Fl.H>
-#include <FL/Fl_Image_Surface.H>
-#include <FL/Fl_Double_Window.H>
-#include <FL/Fl_Graphics_Driver.H>
-
-//int Fl_X::set_cursor(Fl_Cursor) { return 0; }
-//int Fl_X::set_cursor(Fl_RGB_Image const*, int, int) { return 0; }
-
-//Window fl_xid(const Fl_Window* w)
-//{
-//  Fl_X *temp = Fl_X::i(w);
-//  return temp ? temp->xid : 0;
-//}
-
-//Fl_X* Fl_X::make(Fl_Window *w)
-//{
-//  return w->driver()->makeWindow();
-//}
-
-Window fl_window;
-
 
 //
 // End of "$Id: Fl_PicoSDL_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".