mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Fl_X for Pico

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11669 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2016-04-19 22:49:05 +00:00
parent 769d151a12
commit d40b765c86
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
FL/porting.H
View File

@ -47,24 +47,24 @@ 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);
};
//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;

22
src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx
View File

@ -141,19 +141,19 @@ double Fl_PicoSDL_Screen_Driver::wait(double time_to_wait)
#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; }
//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;
}
//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();
}
//Fl_X* Fl_X::make(Fl_Window *w)
//{
// return w->driver()->makeWindow();
//}
Window fl_window;