summaryrefslogtreecommitdiff
path: root/src/drivers/PicoAndroid
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/PicoAndroid')
-rw-r--r--src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx4
-rw-r--r--src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx8
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);