summaryrefslogtreecommitdiffstats
path: root/src/Canvas.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-12-15 13:20:11 +0100
committerDavid Robillard <d@drobilla.net>2020-12-15 18:32:12 +0100
commit4295f103d71d947e3ed92731e648ba409d3664ac (patch)
tree868aa0b684edc5f64400721188901da6b7c6269b /src/Canvas.cpp
parent93fee4579d013ba36d1eedc273fc2d9385d76e19 (diff)
downloadganv-4295f103d71d947e3ed92731e648ba409d3664ac.tar.gz
ganv-4295f103d71d947e3ed92731e648ba409d3664ac.tar.bz2
ganv-4295f103d71d947e3ed92731e648ba409d3664ac.zip
Clean up includes
Diffstat (limited to 'src/Canvas.cpp')
-rw-r--r--src/Canvas.cpp87
1 files changed, 56 insertions, 31 deletions
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
index 4e83507..f3b2499 100644
--- a/src/Canvas.cpp
+++ b/src/Canvas.cpp
@@ -21,42 +21,66 @@
#define _POSIX_C_SOURCE 200809L // strdup
#define _XOPEN_SOURCE 600 // isascii on BSD
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <iostream>
-#include <map>
-#include <set>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <cairo.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkstyle.h>
-#include <gtkmm/widget.h>
+#include "color.h"
+#include "ganv-marshal.h"
+#include "ganv-private.h"
+#include "gettext.h"
#include "ganv/Canvas.hpp"
-#include "ganv/Circle.hpp"
#include "ganv/Edge.hpp"
-#include "ganv/Module.hpp"
-#include "ganv/Port.hpp"
+#include "ganv/Item.hpp"
+#include "ganv/Node.hpp"
#include "ganv/box.h"
#include "ganv/canvas.h"
+#include "ganv/circle.h"
#include "ganv/edge.h"
#include "ganv/group.h"
+#include "ganv/item.h"
+#include "ganv/module.h"
#include "ganv/node.h"
+#include "ganv/port.h"
+#include "ganv/types.h"
#include "ganv_config.h"
-#include "./color.h"
-#include "./ganv-marshal.h"
-#include "./ganv-private.h"
-#include "./gettext.h"
+#include <cairo-pdf.h>
+#include <cairo-ps.h>
+#include <cairo-svg.h>
+#include <cairo.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms-compat.h>
+#include <gdkmm/event.h>
+#include <gdkmm/gc.h>
+#include <gdkmm/screen.h>
+#include <gdkmm/window.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <glibmm/object.h>
+#include <gobject/gclosure.h>
+#include <gtk/gtk.h>
+#include <gtkmm/layout.h>
+#include <gtkmm/object.h>
+#include <gtkmm/style.h>
+#include <gtkmm/widget.h>
+#include <pango/pango-font.h>
+#include <pango/pango-types.h>
+#include <pangomm/fontdescription.h>
+#include <sigc++/signal.h>
+
+#include <algorithm>
+#include <cassert>
+#include <cfloat>
+#include <clocale>
+#include <cmath>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <map>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
#ifdef HAVE_AGRAPH
// Deal with graphviz API amateur hour...
@@ -64,7 +88,10 @@
# define _dll_import 0
# define _BLD_cdt 0
# define _PACKAGE_ast 0
+# include <arith.h>
# include <gvc.h>
+# include <gvcext.h>
+# include <types.h>
#endif
#ifdef GANV_FDGL
# include "./fdgl.hpp"
@@ -74,6 +101,8 @@
static const double GANV_CANVAS_PAD = 8.0;
+struct GanvCanvasImpl;
+
typedef struct {
int x;
int y;
@@ -1777,11 +1806,7 @@ Canvas::get_edge(Node* tail, Node* head) const
extern "C" {
-#include "ganv/canvas.h"
-
-#include "./boilerplate.h"
-#include "./color.h"
-#include "./gettext.h"
+#include "boilerplate.h"
G_DEFINE_TYPE_WITH_CODE(GanvCanvas, ganv_canvas, GTK_TYPE_LAYOUT,
G_ADD_PRIVATE(GanvCanvas))