gegl r2028 - in trunk: . bin

[martinn svn gnome org]

Author: martinn
Date: Sat Feb 16 21:20:42 2008
New Revision: 2028
URL: http://svn.gnome.org/viewvc/gegl?rev=2028&view=rev

Log:
2008-02-16  Martin Nordholts  <martinn svn gnome org>

	* bin/editor-optype.h: New include file to contain the
	gegl_typeeditor_optype() function declaration (renamed from
	typeeditor_optype()).

	* bin/gegl-node-editor.c
	* bin/editor.c
	* bin/editor-optype.c: Use the new include file.

	* bin/Makefile.am: Added the new include file.


Added:
   trunk/bin/editor-optype.h
Modified:
   trunk/ChangeLog
   trunk/bin/Makefile.am
   trunk/bin/editor-optype.c
   trunk/bin/editor.c
   trunk/bin/gegl-node-editor.c

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	(original)
+++ trunk/bin/Makefile.am	Sat Feb 16 21:20:42 2008
@@ -12,6 +12,7 @@
 	editor.c				\
 	editor.h				\
 	editor-optype.c				\
+	editor-optype.h				\
 	export.c				\
 	export.h				\
 	gegl-node-editor.c			\

Modified: trunk/bin/editor-optype.c
==============================================================================
--- trunk/bin/editor-optype.c	(original)
+++ trunk/bin/editor-optype.c	Sat Feb 16 21:20:42 2008
@@ -25,14 +25,17 @@
 #include "gegl-node-editor.h"
 #include "gegl-tree-editor-action.h"
 
+
 extern GeglNode *editor_output;
 
-static void entry_activate (GtkEntry * entry, gpointer user_data);
 
-static gboolean
-completion_match_selected (GtkEntryCompletion * completion,
-                           GtkTreeModel *model,
-                           GtkTreeIter *iter, gpointer user_data);
+static void     entry_activate            (GtkEntry           *entry,
+                                           gpointer            user_data);
+static gboolean completion_match_selected (GtkEntryCompletion *completion,
+                                           GtkTreeModel       *model,
+                                           GtkTreeIter        *iter,
+                                           gpointer            user_data);
+
 
 static void popup_properties (GeglNode *node)
 {
@@ -391,17 +394,10 @@
   gtk_menu_popup (menu, NULL, NULL, gtk_option_menu_position, button, 0, 0);
 }
 
-/* FIXME: this should be in a header, here to silence gcc in extreme
- * strictness of error reporting mode
- */
-GtkWidget *
-typeeditor_optype (GtkSizeGroup *col1,
-                   GtkSizeGroup *col2,
-                   GeglNodeEditor *node_editor);
 GtkWidget *
-typeeditor_optype (GtkSizeGroup *col1,
-                   GtkSizeGroup *col2,
-                   GeglNodeEditor *node_editor)
+gegl_typeeditor_optype (GtkSizeGroup   *col1,
+                        GtkSizeGroup   *col2,
+                        GeglNodeEditor *node_editor)
 {
   GtkWidget *hbox;
   GtkWidget *label = NULL;

Added: trunk/bin/editor-optype.h
==============================================================================
--- (empty file)
+++ trunk/bin/editor-optype.h	Sat Feb 16 21:20:42 2008
@@ -0,0 +1,28 @@
+/* This file is part of GEGL editor -- a gtk frontend for GEGL
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright (C) 2008 Martin Nordholts
+ */
+
+#ifndef GEGL_EDITOR_OPTYPE_H
+#define GEGL_EDITOR_OPTYPE_H
+
+
+GtkWidget * gegl_typeeditor_optype (GtkSizeGroup   *col1,
+                                    GtkSizeGroup   *col2,
+                                    GeglNodeEditor *node_editor);
+
+
+#endif /* GEGL_EDITOR_OPTYPE_H */

Modified: trunk/bin/editor.c
==============================================================================
--- trunk/bin/editor.c	(original)
+++ trunk/bin/editor.c	Sat Feb 16 21:20:42 2008
@@ -26,6 +26,7 @@
 #include "gegl-node-editor.h"
 #include "editor.h"
 #include "gegl-view.h"
+#include "editor-optype.h"
 #include <gdk/gdkkeysyms.h>
 
 #ifdef G_OS_WIN32
@@ -63,11 +64,6 @@
   return FALSE;
 }
 
-GtkWidget *
-typeeditor_optype (GtkSizeGroup   *col1,
-                   GtkSizeGroup   *col2,
-                   GeglNodeEditor *node_editor);
-
 Editor editor;
 
 static void editor_set_gegl (GeglNode    *gegl);
@@ -123,7 +119,7 @@
   gtk_paned_pack2 (GTK_PANED (hpaned_top), editor->tree_editor, FALSE, TRUE);
 
     {
-      GtkWidget *foo = typeeditor_optype (NULL, NULL, NULL);
+      GtkWidget *foo = gegl_typeeditor_optype (NULL, NULL, NULL);
       gtk_box_pack_start (GTK_BOX (add_box), foo, TRUE, TRUE, 0);
     }
 

Modified: trunk/bin/gegl-node-editor.c
==============================================================================
--- trunk/bin/gegl-node-editor.c	(original)
+++ trunk/bin/gegl-node-editor.c	Sat Feb 16 21:20:42 2008
@@ -27,13 +27,7 @@
 
 #include "gegl-node-editor.h"
 #include "gegl-paramspecs.h"
-
-
-/* FIXME: EEEEEEEEEK :( */
-GtkWidget *
-typeeditor_optype (GtkSizeGroup *col1,
-                   GtkSizeGroup *col2,
-                   GeglNodeEditor *node_editor);
+#include "editor-optype.h"
 
 enum
 {
@@ -161,7 +155,7 @@
 
   if (self->operation_switcher)
     {
-      gtk_box_pack_start (GTK_BOX (object), typeeditor_optype (self->col1, self->col2, self), FALSE, FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (object), gegl_typeeditor_optype (self->col1, self->col2, self), FALSE, FALSE, 0);
     }
 
   gegl_node_editor_construct (GEGL_NODE_EDITOR (object));