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 +++ src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx | 4 ++++ src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 7 ++++++- 4 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src/drivers') 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() diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx index 1c3697f8e..13ebe0ef0 100644 --- a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx +++ b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx @@ -145,6 +145,8 @@ double Fl_PicoSDL_Screen_Driver::wait(double time_to_wait) 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; } @@ -213,6 +215,8 @@ void Fl_X::flush() w->flush(); } +#endif // !defined(FL_DOXYGEN) // FIXME silence Doxygen warnings + // // End of "$Id: Fl_PicoSDL_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $". diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index 04c7a8edd..d23a00432 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -360,6 +360,8 @@ void Fl_WinAPI_Window_Driver::free_icons() { } +#if !defined(FL_DOXYGEN) // FIXME - silence Doxygen warnings + /** Sets the window icons using Windows' native HICON icon handles. The given icons are copied. You can free the icons immediately after @@ -381,7 +383,6 @@ void Fl_Window::icons(HICON big_icon, HICON small_icon) Fl_X::i(this)->set_icons(); } - /** Sets the default window icons. Convenience function to set the default icons using Windows' @@ -405,6 +406,7 @@ void Fl_Window::default_icons(HICON big_icon, HICON small_icon) { Fl_X::set_default_icons(big_icon, small_icon); } +#endif // !defined(FL_DOXYGEN) // FIXME - silence Doxygen warnings void Fl_WinAPI_Window_Driver::wait_for_expose() { if (!shown()) return; @@ -531,6 +533,7 @@ void Fl_WinAPI_Window_Driver::unmap() { ShowWindow(fl_xid(pWindow), SW_HIDE); } +#if !defined(FL_DOXYGEN) // FIXME - silence Doxygen warning void Fl_X::make_fullscreen(int X, int Y, int W, int H) { int top, bottom, left, right; @@ -565,6 +568,8 @@ void Fl_X::make_fullscreen(int X, int Y, int W, int H) { SetWindowPos(xid, HWND_TOP, X, Y, W, H, SWP_NOSENDCHANGING | SWP_FRAMECHANGED); } +#endif // !defined(FL_DOXYGEN) // FIXME - silence Doxygen warning + void Fl_WinAPI_Window_Driver::fullscreen_on() { pWindow->_set_fullscreen(); -- cgit v1.2.3