[dia] Remove superfluous diacanvas.[ch]



commit bd13441830d0754b2dd571ee06f6fc59d49557bb
Author: Hans Breuer <hans breuer org>
Date:   Fri Jun 3 15:56:34 2011 +0200

    Remove superfluous diacanvas.[ch]
    
    Nothing of it was used ever, which could not as well
    be got from GtkDrawingArea ...

 app/Makefile.am   |    2 -
 app/diacanvas.c   |  548 -----------------------------------------------------
 app/diacanvas.h   |   92 ---------
 app/interface.c   |    8 +-
 app/makefile.msc  |    1 -
 app/modify_tool.c |    1 -
 po/POTFILES.in    |    1 -
 7 files changed, 2 insertions(+), 651 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index 2538507..bbd07cd 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -189,8 +189,6 @@ dia_core_files = \
 	dynamic_refresh.c \
 	navigation.h \
 	navigation.c \
-	diacanvas.c \
-	diacanvas.h \
 	highlight.c \
 	highlight.h \
 	textedit.c \
diff --git a/app/interface.c b/app/interface.c
index 62d76f2..df320cc 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -55,7 +55,6 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "dia-app-icons.h"
-#include "diacanvas.h"
 
 #include "pixmaps/swap.xpm"
 #include "pixmaps/default.xpm"
@@ -633,7 +632,7 @@ use_integrated_ui_for_display_shell(DDisplay *ddisp, char *title)
   gtk_widget_show(navigation_button);
 
   /*  Canvas  */
-  ddisp->canvas = dia_canvas_new();
+  ddisp->canvas = gtk_drawing_area_new();
   
   /* Dia's canvas does it's double buffering alone so switch off GTK's */
   gtk_widget_set_double_buffered (ddisp->canvas, FALSE);
@@ -867,12 +866,9 @@ create_display_shell(DDisplay *ddisp,
 
   /*  Canvas  */
   /*  ddisp->canvas = gtk_drawing_area_new ();*/
-  ddisp->canvas = dia_canvas_new();
+  ddisp->canvas = gtk_drawing_area_new();
   /* Dia's canvas does it' double buffering alone so switch off GTK's */
   gtk_widget_set_double_buffered (ddisp->canvas, FALSE);
-#if 0 /* the following call forces the minimum diagram window size. But it seems to be superfluous otherwise. */
-  dia_canvas_set_size(DIA_CANVAS (ddisp->canvas), width, height);
-#endif
   gtk_widget_set_events (ddisp->canvas, CANVAS_EVENT_MASK);
   GTK_WIDGET_SET_FLAGS (ddisp->canvas, GTK_CAN_FOCUS);
   g_signal_connect (GTK_OBJECT (ddisp->canvas), "event",
diff --git a/app/makefile.msc b/app/makefile.msc
index 01cdfb9..b0f6eab 100644
--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -31,7 +31,6 @@ OBJECTS = \
 	cursor.obj \
 	cut_n_paste.obj \
 	defaults.obj \
-	diacanvas.obj \
 	diagram.obj \
 	diapagelayout.obj \
 	dia-props.obj \
diff --git a/app/modify_tool.c b/app/modify_tool.c
index f19af08..8ffd0c0 100644
--- a/app/modify_tool.c
+++ b/app/modify_tool.c
@@ -36,7 +36,6 @@
 #include "textline.h"
 
 #include "parent.h"
-#include "diacanvas.h"
 #include "prop_text.h"
 #include "object.h"
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f8166f3..eafb413 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ app/confirm.c
 app/create_object.c
 app/defaults.c
 app/dia-props.c
-app/diacanvas.c
 app/diagram.c
 app/diagram_tree_model.c
 app/diagram_tree_view.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]