From f120334da3fd538eb44498f3928f93e12af6aab1 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 6 Apr 2016 22:20:32 +0000 Subject: Fix Doxygen warnings. There was one obvious warning in src/fl_read_image.cxx, but others have to do with incomplete code and platform specific definitions. I'm not entirely happy with these changes. Temporary changes have been marked with 'FIXME' and should be removed later if possible. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11547 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx | 4 ++++ src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx | 3 +++ 2 files changed, 7 insertions(+) (limited to 'src/drivers/PicoAndroid') diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx index 1420592f3..cdfcdb32f 100644 --- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx +++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx @@ -458,6 +458,8 @@ Fl_Fontdesc* fl_fonts = NULL; Undefined symbols for architecture x86_64: */ +#if !defined(FL_DOXYGEN) // *FIXME* silence Doxygen warnings + void fl_set_spot(int, int, int, int, int, int, Fl_Window*) { } void fl_reset_spot() { } const char *fl_filename_name(char const*) { return 0; } @@ -533,6 +535,8 @@ Fl_Font_Descriptor::~Fl_Font_Descriptor() { } +#endif // !defined(FL_DOXYGEN) + #if 0 ld: error: ./obj/local/armeabi-v7a/objs/native-activity/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.o: multiple definition of 'Fl_Window::make_current()' diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx index 67b5159a8..b2024bf01 100644 --- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx +++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx @@ -108,12 +108,15 @@ void Fl_PicoAndroid_Window_Driver::flush_single() scr->drawFrame(); } +#if !defined(FL_DOXYGEN) // FIXME - silence Doxygen warning void Fl_X::flush() { w->flush(); } +#endif // !defined(FL_DOXYGEN) // FIXME - silence Doxygen warning + #if 0 void Fl_PicoAndroid_Window_Driver::flush() -- cgit v1.2.3