diff options
Diffstat (limited to 'src/Fl_Cairo.cxx')
| -rw-r--r-- | src/Fl_Cairo.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/Fl_Cairo.cxx b/src/Fl_Cairo.cxx index 2387fa19a..be19dede7 100644 --- a/src/Fl_Cairo.cxx +++ b/src/Fl_Cairo.cxx @@ -33,7 +33,7 @@ // static initialization -Fl_Cairo_State Fl::Private::cairo_state_; ///< current Cairo context information +Fl_Cairo_State Fl_Private_cairo_state_; ///< current Cairo context information /** When FLTK_HAVE_CAIRO is defined and cairo_autolink_context() is true, any current window dc is linked to a current Cairo context. @@ -51,7 +51,7 @@ Fl_Cairo_State Fl::Private::cairo_state_; ///< current Cairo context information \note Only available if built with CMake option FLTK_OPTION_CAIRO_WINDOW=ON. */ void Fl::cairo_autolink_context(bool alink) { - Private::cairo_state_.autolink(alink); + Fl_Private_cairo_state_.autolink(alink); } /** @@ -63,12 +63,12 @@ void Fl::cairo_autolink_context(bool alink) { \note Only available if built with CMake option FLTK_OPTION_CAIRO_EXT=ON. */ bool Fl::cairo_autolink_context() { - return Private::cairo_state_.autolink(); + return Fl_Private_cairo_state_.autolink(); } /** Gets the current Cairo context linked with a fltk window. */ cairo_t *Fl::cairo_cc() { - return Private::cairo_state_.cc(); + return Fl_Private_cairo_state_.cc(); } /** Sets the current Cairo context to \p c. @@ -77,7 +77,7 @@ cairo_t *Fl::cairo_cc() { \note Only available if built with CMake option FLTK_OPTION_CAIRO_WINDOW=ON. */ void Fl::cairo_cc(cairo_t *c, bool own /* = false */) { - Private::cairo_state_.cc(c, own); + Fl_Private_cairo_state_.cc(c, own); } @@ -121,18 +121,18 @@ cairo_t *Fl::cairo_make_current(Fl_Window *wi) { if (fl_gc == 0) { // means remove current cc Fl::cairo_cc(0); // destroy any previous cc - Fl::Private::cairo_state_.window(0); + Fl_Private_cairo_state_.window(0); return 0; } // don't re-create a context if it's the same gc/window combination - if (fl_gc == Fl::Private::cairo_state_.gc() && fl_xid(wi) == (Window)Fl::Private::cairo_state_.window()) + if (fl_gc == Fl_Private_cairo_state_.gc() && fl_xid(wi) == (Window)Fl_Private_cairo_state_.window()) return Fl::cairo_cc(); // Scale the Cairo context appropriately float scale = Fl::screen_scale(wi->screen_num()); - cairo_ctxt = Fl::Private::cairo_make_current(0, wi->w() * scale, wi->h() * scale); - Fl::Private::cairo_state_.window((void *)fl_xid(wi)); + cairo_ctxt = Fl_Private_cairo_make_current(0, wi->w() * scale, wi->h() * scale); + Fl_Private_cairo_state_.window((void *)fl_xid(wi)); cairo_scale(cairo_ctxt, scale, scale); return cairo_ctxt; } @@ -151,17 +151,17 @@ static cairo_surface_t *cairo_create_surface(void *gc, int W, int H) { \note Only available if CMake FLTK_OPTION_CAIRO_WINDOW is enabled. */ -cairo_t *Fl::Private::cairo_make_current(void *gc, int W, int H) { - if (gc == Fl::Private::cairo_state_.gc() && - fl_window == (Window)Fl::Private::cairo_state_.window() && - cairo_state_.cc() != 0) // no need to create a cc, just return that one - return cairo_state_.cc(); +cairo_t *Fl_Private_cairo_make_current(void *gc, int W, int H) { + if (gc == Fl_Private_cairo_state_.gc() && + fl_window == (Window)Fl_Private_cairo_state_.window() && + Fl_Private_cairo_state_.cc() != 0) // no need to create a cc, just return that one + return Fl_Private_cairo_state_.cc(); // we need to (re-)create a fresh cc ... - cairo_state_.gc(gc); // keep track for next time + Fl_Private_cairo_state_.gc(gc); // keep track for next time cairo_surface_t *s = cairo_create_surface(gc, W, H); cairo_t *c = cairo_create(s); - cairo_state_.cc(c); // and purge any previously owned context + Fl_Private_cairo_state_.cc(c); // and purge any previously owned context cairo_surface_destroy(s); return c; } |