diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Canvas.cpp | 20 | ||||
| -rw-r--r-- | src/module.c | 1 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/Canvas.cpp b/src/Canvas.cpp index 7a77497..66e1bf3 100644 --- a/src/Canvas.cpp +++ b/src/Canvas.cpp @@ -463,7 +463,7 @@ struct GanvCanvasImpl { int redraw_x2; int redraw_y2; - /* Offsets of the temprary drawing pixmap */ + /* Offsets of the temporary drawing pixmap */ int draw_xofs; int draw_yofs; @@ -812,6 +812,8 @@ GanvCanvasImpl::layout_dot(const std::string& filename) } #endif +namespace { + inline uint64_t get_monotonic_time() { @@ -824,8 +826,12 @@ get_monotonic_time() #endif } +} // namespace + #ifdef GANV_FDGL +namespace { + inline Region get_region(GanvNode* node) { @@ -855,6 +861,8 @@ apply_force(GanvNode* a, GanvNode* b, const Vector& f) b->impl->force = vec_sub(b->impl->force, f); } +} // namespace + gboolean GanvCanvasImpl::layout_iteration() { @@ -3193,7 +3201,7 @@ ganv_canvas_emit_event(GanvCanvas* canvas, GdkEvent* event) } } - /* Convert to world coordinates -- we have two cases because of diferent + /* Convert to world coordinates -- we have two cases because of different * offsets of the fields in the event structures. */ @@ -4062,7 +4070,9 @@ ganv_canvas_request_update(GanvCanvas* canvas) } } -static inline gboolean +namespace { + +inline gboolean rect_overlaps(const IRect* a, const IRect* b) { if ((a->x > b->x + b->width) || @@ -4074,7 +4084,7 @@ rect_overlaps(const IRect* a, const IRect* b) return TRUE; } -static inline gboolean +inline gboolean rect_is_visible(GanvCanvas* canvas, const IRect* r) { const IRect rect = { @@ -4087,6 +4097,8 @@ rect_is_visible(GanvCanvas* canvas, const IRect* r) return rect_overlaps(&rect, r); } +} // namespace + void ganv_canvas_request_redraw_c(GanvCanvas* canvas, int x1, int y1, int x2, int y2) diff --git a/src/module.c b/src/module.c index efdc2b9..e517b86 100644 --- a/src/module.c +++ b/src/module.c @@ -26,6 +26,7 @@ #include <ganv/widget.h> #include <cairo.h> +#include <gdk/gdk.h> #include <glib-object.h> #include <glib.h> #include <gobject/gclosure.h> |