gegl r2298 - in trunk: . bin

[ok svn gnome org]

Author: ok
Date: Sat May 17 13:08:18 2008
New Revision: 2298
URL: http://svn.gnome.org/viewvc/gegl?rev=2298&view=rev

Log:
* bin/gegl-bin-gui-types.h: removed GeglView from list of types.
* bin/gegl-view.[ch]: (button_press_event): made it less dependent on
the rest of the GEGL binary code base.


Modified:
   trunk/ChangeLog
   trunk/bin/gegl-bin-gui-types.h
   trunk/bin/gegl-view.c
   trunk/bin/gegl-view.h

Modified: trunk/bin/gegl-bin-gui-types.h
==============================================================================
--- trunk/bin/gegl-bin-gui-types.h	(original)
+++ trunk/bin/gegl-bin-gui-types.h	Sat May 17 13:08:18 2008
@@ -25,7 +25,6 @@
 typedef struct _Editor          Editor;
 typedef struct _GeglNodeEditor  GeglNodeEditor;
 typedef struct _GeglStore       GeglStore;
-typedef struct _GeglView        GeglView;
 
 
 #endif /* GEGL_EDITOR_TYPES_H */

Modified: trunk/bin/gegl-view.c
==============================================================================
--- trunk/bin/gegl-view.c	(original)
+++ trunk/bin/gegl-view.c	Sat May 17 13:08:18 2008
@@ -23,14 +23,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "gegl-bin-gui-types.h"
-
 #include "gegl.h"
-
 #include "gegl-view.h"
-#include "gegl-tree-editor.h"
-#include "editor.h"
-
 
 enum
 {
@@ -48,13 +42,13 @@
   gint           x;
   gint           y;
   gdouble        scale;
-  gint           screen_x;  /* coordinates of drag start */
+  gint           screen_x;    /* coordinates of drag start */
   gint           screen_y;
 
-  gint           orig_x;    /* coordinates of drag start */
+  gint           orig_x;      /* coordinates of drag start */
   gint           orig_y;
 
-  gint           start_buf_x;    /* coordinates of drag start */
+  gint           start_buf_x; /* coordinates of drag start */
   gint           start_buf_y;
 
   gint           prev_x;
@@ -317,7 +311,9 @@
         g_free (name);
         g_free (operation);
 #endif
+#if 0
         tree_editor_set_active (editor.tree_editor, detected);
+#endif
       }
   }
 

Modified: trunk/bin/gegl-view.h
==============================================================================
--- trunk/bin/gegl-view.h	(original)
+++ trunk/bin/gegl-view.h	Sat May 17 13:08:18 2008
@@ -28,6 +28,7 @@
 #define GEGL_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GEGL_TYPE_VIEW))
 #define GEGL_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GEGL_TYPE_VIEW, GeglViewClass))
 
+typedef struct _GeglView        GeglView;
 typedef struct _GeglViewClass   GeglViewClass;
 
 struct _GeglView