diff options
Diffstat (limited to 'src/Fl_Private.H')
| -rw-r--r-- | src/Fl_Private.H | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/src/Fl_Private.H b/src/Fl_Private.H index 11c4b5dd9..c86ac930f 100644 --- a/src/Fl_Private.H +++ b/src/Fl_Private.H @@ -15,7 +15,7 @@ // /** \file src/Fl_Private.H - \brief Fl::Private namespace. + \brief FLTK private global variables and functions. */ #ifndef Fl_Private_H @@ -24,21 +24,20 @@ #include <FL/fl_config.h> // build configuration #include <FL/Fl.H> -/** +/* FLTK private global variables and functions. + All prefixed with Fl_Private_ instead of using namespace. */ -namespace Fl { -namespace Private { -FL_EXPORT extern int use_high_res_GL_; -FL_EXPORT extern int draw_GL_text_with_textures_; -FL_EXPORT extern int box_shadow_width_; -FL_EXPORT extern int box_border_radius_max_; -FL_EXPORT extern int selection_to_clipboard_; +FL_EXPORT extern int Fl_Private_use_high_res_GL_; +FL_EXPORT extern int Fl_Private_draw_GL_text_with_textures_; +FL_EXPORT extern int Fl_Private_box_shadow_width_; +FL_EXPORT extern int Fl_Private_box_border_radius_max_; +FL_EXPORT extern int Fl_Private_selection_to_clipboard_; -FL_EXPORT extern unsigned char options_[OPTION_LAST]; -FL_EXPORT extern unsigned char options_read_; -FL_EXPORT extern int program_should_quit_; // non-zero means the program was asked to cleanly terminate +FL_EXPORT extern unsigned char Fl_Private_options_[Fl::OPTION_LAST]; +FL_EXPORT extern unsigned char Fl_Private_options_read_; +FL_EXPORT extern int Fl_Private_program_should_quit_; // non-zero means the program was asked to cleanly terminate /** The currently executing idle callback function: DO NOT USE THIS DIRECTLY! @@ -47,10 +46,10 @@ FL_EXPORT extern int program_should_quit_; // non-zero means the program was ask idle callback functions to be called. \see add_idle(), remove_idle() */ -FL_EXPORT extern void (*idle_)(); +FL_EXPORT extern void (*Fl_Private_idle_)(); -FL_EXPORT extern void run_idle(); -FL_EXPORT extern void run_checks(); +FL_EXPORT extern void Fl_Private_run_idle(); +FL_EXPORT extern void Fl_Private_run_checks(); /** Sets an idle callback (internal use only). @@ -61,19 +60,13 @@ FL_EXPORT extern void run_checks(); See documentation: use Fl::add_idle() instead. */ -FL_EXPORT inline void set_idle_(Fl_Old_Idle_Handler cb) { idle_ = cb; } +FL_EXPORT inline void Fl_Private_set_idle_(Fl_Old_Idle_Handler cb) { Fl_Private_idle_ = cb; } #ifdef FLTK_HAVE_CAIRO -#if 0 // this non-public function appears not to be used anywhere in FLTK - FL_EXPORT extern cairo_t *cairo_make_current(void *gc); -#endif -FL_EXPORT extern cairo_t *cairo_make_current(void *gc, int W, int H); -FL_EXPORT extern Fl_Cairo_State cairo_state_; +FL_EXPORT extern cairo_t *Fl_Private_cairo_make_current(void *gc, int W, int H); +FL_EXPORT extern Fl_Cairo_State Fl_Private_cairo_state_; #endif // FLTK_HAVE_CAIRO -} // namespace Private -} // namespace Fl - #endif // !Fl_Private_H |