Provide Fl_Window_Driver accessor methods for public Fl_Window attributes.

These methods are intended to be used instead of pWindow->method()
for better code readability and easier porting of methods from
Fl_Window to Fl_Window_Driver.

New methods: x(), y(), y(), h(), shown(), parent(), border(),
  visible(), and visible_r().

We should add more such methods if appropriate.


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

2 files changed, 6 insertions, 6 deletions

diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
index c7bd1784e..5cc0142a7 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
@@ -512,11 +512,11 @@ Window fl_window;
 //void Fl_Image_Surface::translate(int x, int y) { }
 //void Fl_Image_Surface::untranslate() { }
 
-void Fl::add_fd(int, int, void (*)(int, void*), void*)
+void Fl::add_fd(int, int, Fl_FD_Handler, void*)
 {
 }
 
-void Fl::add_fd(int, void (*)(int, void*), void*)
+void Fl::add_fd(int, Fl_FD_Handler, void*)
 {
 }
 
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
index 19312ee77..c8983fc41 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
@@ -58,12 +58,12 @@ Fl_X *Fl_PicoAndroid_Window_Driver::makeWindow()
   Fl_PicoAndroid_Screen_Driver *scr = (Fl_PicoAndroid_Screen_Driver*)Fl::screen_driver();
 
   Fl_Group::current(0);
-  if (pWindow->parent() && !Fl_X::i(pWindow->window())) {
+  if (parent() && !Fl_X::i(pWindow->window())) {
     pWindow->set_visible();
     return 0L;
   }
   Window parent;
-  if (pWindow->parent()) {
+  if (parent()) {
     parent = fl_xid(pWindow->window());
   } else {
     parent = 0;
@@ -73,9 +73,9 @@ Fl_X *Fl_PicoAndroid_Window_Driver::makeWindow()
   x->w = pWindow;
   x->region = 0;
   if (!pWindow->force_position()) {
-//    pNativeWindow = SDL_CreateWindow(pWindow->label(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, pWindow->w(), pWindow->h(), 0);
+//    pNativeWindow = SDL_CreateWindow(pWindow->label(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w(), h(), 0);
   } else {
-//    pNativeWindow = SDL_CreateWindow(pWindow->label(), pWindow->x(), pWindow->y(), pWindow->w(), pWindow->h(), 0);
+//    pNativeWindow = SDL_CreateWindow(pWindow->label(), x(), y(), w(), h(), 0);
   }
   pNativeWindow = scr->pApp->window;
 //  x->xid = SDL_CreateRenderer(pNativeWindow, -1, SDL_RENDERER_ACCELERATED);