snapshot

diff --git a/helm/gtkmathview-bonobo/src/Makefile.am b/helm/gtkmathview-bonobo/src/Makefile.am
index 4de86a0b73d6e4f1789d84581001876decabe121..e856b6f53d3bb1dd6a3afaaa371771562f169014 100644 (file)
--- a/helm/gtkmathview-bonobo/src/Makefile.am
+++ b/helm/gtkmathview-bonobo/src/Makefile.am
@@ -8,12 +8,12 @@ CLEANFILES = $(server_in_files:.server.in.in=.server)
 IDL = $(top_srcdir)/idl/GtkMathView.idl
 
 IDL_GENERATED_C = \
-  GNOME_GtkMathView_View-common.c \
-  GNOME_GtkMathView_View-skels.c \
-  GNOME_GtkMathView_View-stubs.c
+  GtkMathView-common.c \
+  GtkMathView-skels.c \
+  GtkMathView-stubs.c
 
 IDL_GENERATED_H = \
-  GNOME_GtkMathView_View.h
+  GtkMathView.h
 
 IDL_GENERATED = $(IDL_GENERATED_C) $(IDL_GENERATED_H)
 

diff --git a/helm/gtkmathview-bonobo/src/view.c b/helm/gtkmathview-bonobo/src/view.c
index 95848730fba12caa963e93ff728e63175042e31c..9f7451f400ba5b0ae3f5f338f8abc54d4a425f4a 100644 (file)
--- a/helm/gtkmathview-bonobo/src/view.c
+++ b/helm/gtkmathview-bonobo/src/view.c
@@ -11,6 +11,7 @@ view_object_finalize(GObject* object)
   View* view = VIEW(object);
   /* free resources */
   view_parent_class->finalize(object);
+  return;
 }
 
 static void
@@ -19,6 +20,7 @@ impl_view_freeze(PortableServer_Servant servant,
 {
   View* view = VIEW (bonobo_object (servant));
   gtk_math_view_freeze(view->control_data->math_view);
+  return;
 }
 
 static void
@@ -27,6 +29,7 @@ impl_view_thaw(PortableServer_Servant servant,
 {
   View* view = VIEW (bonobo_object (servant));
   gtk_math_view_thaw(view->control_data->math_view);
+  return;
 }
 
 static void
@@ -36,6 +39,152 @@ impl_view_load(PortableServer_Servant servant,
 {
   View* view = VIEW (bonobo_object (servant));
   gtk_math_view_load_uri(view->control_data->math_view, uri);
+  return;
+}
+
+static void
+impl_view_unload(PortableServer_Servant servant,
+                 CORBA_Environment *ev)
+{
+  View* view = VIEW (bonobo_object (servant));
+  gtk_math_view_unload(view->control_data->math_view);
+  return;
+}
+
+static void
+impl_view_setIdAttribute (PortableServer_Servant servant,
+                const CORBA_char *ns,
+                const CORBA_char *name,
+                CORBA_Environment *ev)
+{
+    return;
+}
+
+
+static void
+impl_view_getIdAttribute (PortableServer_Servant servant,
+                CORBA_char *ns,
+                CORBA_char *name,
+                CORBA_Environment *ev)
+{
+    return;
+}
+
+static void 
+impl_view_select(PortableServer_Servant servant,
+       //in element_id elem,
+       CORBA_Environment *ev)
+{
+    return;
+}
+      
+static void 
+impl_view_unselect(PortableServer_Servant servant,
+         //in element_id elem,
+         CORBA_Environment *ev)
+{
+    return;
+}
+      
+static CORBA_boolean 
+impl_view_isSelected(PortableServer_Servant servant,
+            //in element_id elem,
+            CORBA_Environment *ev)
+{
+    return;
+}
+
+static CORBA_boolean 
+impl_view_elementBoundingBox(PortableServer_Servant servant,
+                             //in element_id elem,
+                             CORBA_short *x,CORBA_short *y,
+                             CORBA_short *width,CORBA_short *height, 
+                             CORBA_short *depth,
+                             CORBA_Environment *ev)
+{
+    return;
+}
+
+static void 
+impl_view_getBoundingBox(PortableServer_Servant servant,
+                         CORBA_short *width, 
+                         CORBA_short *height, 
+                         CORBA_short *depth,
+                         CORBA_Environment *ev)
+{
+    return;
+}
+
+static void 
+impl_view_getSize(PortableServer_Servant servant,
+                  CORBA_short *width,CORBA_short *height,
+                  CORBA_short *totalWidth,CORBA_short *totalHeight,
+                  CORBA_Environment *ev)
+{
+    //View* view = VIEW (bonobo_object (servant));
+    //gtk_math_view_get_top(view->control_data->math_view,x,y);
+    
+    return;
+}
+
+static void 
+impl_view_getTop(PortableServer_Servant servant,
+                 CORBA_short *x,CORBA_short *y,
+                 CORBA_Environment *ev)
+{
+    View* view = VIEW (bonobo_object (servant));
+    gtk_math_view_get_top(view->control_data->math_view,x,y);
+    return;
+}
+
+static void 
+impl_view_setTop (PortableServer_Servant servant,
+                  const CORBA_short x,const CORBA_short y,
+                  CORBA_Environment *ev)
+{
+    View* view = VIEW (bonobo_object (servant));
+    gtk_math_view_set_top(view->control_data->math_view,x,y);
+    return;
+}
+
+static void 
+impl_view_setDefaultFontSize(PortableServer_Servant servant,
+                             const CORBA_short size,
+                             CORBA_Environment *ev)
+{
+    View* view = VIEW (bonobo_object (servant));
+    gtk_math_view_set_font_size(view->control_data->math_view,size);
+    return;
+}
+
+static short 
+impl_view_getDefaultFontSize(PortableServer_Servant servant,
+                             CORBA_Environment *ev)
+{
+    short int ris;
+    View* view = VIEW (bonobo_object (servant));
+    ris = gtk_math_view_get_font_size(view->control_data->math_view);
+    return ris;
+}
+
+static void 
+impl_view_setVerbosity(PortableServer_Servant servant,
+                       const CORBA_short level,
+                       CORBA_Environment *ev)
+{
+    View* view = VIEW (bonobo_object (servant));
+    gtk_math_view_set_log_verbosity(view->control_data->math_view,level); 
+    return;
+}
+
+static short 
+impl_view_getVerbosity(PortableServer_Servant servant,
+                       CORBA_Environment *ev)
+{
+    short int ris;
+    View* view = VIEW (bonobo_object (servant));
+    ris = gtk_math_view_get_log_verbosity(view->control_data->math_view);
+    return ris;
 }
 
 static void
@@ -49,6 +198,24 @@ view_class_init(ViewClass* klass)
   
   epv->freeze = impl_view_freeze;
   epv->thaw = impl_view_thaw;
+  epv->load = impl_view_load;
+  epv->unload = impl_view_unload;
+  epv->setIdAttribute = impl_view_setIdAttribute;
+  epv->getIdAttribute = impl_view_getIdAttribute;
+  epv->select = impl_view_select;
+  epv->unselect = impl_view_unselect;
+  epv->isSelected = impl_view_isSelected;
+  epv->elementBoundingBox = impl_view_elementBoundingBox;
+  epv->getBoundingBox = impl_view_getBoundingBox;
+  epv->getSize = impl_view_getSize;
+  epv->getTop = impl_view_getTop;
+  epv->setTop = impl_view_setTop;
+  epv->setDefaultFontSize = impl_view_setDefaultFontSize;
+  epv->getDefaultFontSize = impl_view_getDefaultFontSize;
+  epv->setVerbosity = impl_view_setVerbosity;
+  epv->getVerbosity = impl_view_getVerbosity;
+
+  return;
 }
 
 static void

diff --git a/helm/gtkmathview-bonobo/src/view.h b/helm/gtkmathview-bonobo/src/view.h
index 9116a3c98e7edcc7e6d41afe23d756e367d06a78..a652726add055f81ad6cdb692048ac301405bf28 100644 (file)
--- a/helm/gtkmathview-bonobo/src/view.h
+++ b/helm/gtkmathview-bonobo/src/view.h
@@ -4,7 +4,7 @@
 
 #include <bonobo.h>
 
-#include "GNOME_GtkMathView_View.h"
+#include "GtkMathView.h"
 #include "control-data.h"
 
 #define VIEW_TYPE        (view_get_type())

diff --git a/helm/gtkmathview-bonobo/test/Makefile.am b/helm/gtkmathview-bonobo/test/Makefile.am
index 3336948ff0f5bf94498feb34a405c0a54a2f87c9..204ae3dfcb6e3392544d33923a9cac66e4b32f5c 100644 (file)
--- a/helm/gtkmathview-bonobo/test/Makefile.am
+++ b/helm/gtkmathview-bonobo/test/Makefile.am
@@ -3,8 +3,8 @@ noinst_PROGRAMS = viewer
 
 viewer_SOURCES = \
   main.c \
-  $(top_srcdir)/src/GNOME_GtkMathView_View-common.c \
-  $(top_srcdir)/src/GNOME_GtkMathView_View-stubs.c
+  $(top_srcdir)/src/GtkMathView-common.c \
+  $(top_srcdir)/src/GtkMathView-stubs.c
 
 viewer_LDADD = \
   $(BONOBOUI_LIBS) \

diff --git a/helm/gtkmathview-bonobo/test/main.c b/helm/gtkmathview-bonobo/test/main.c
index 84aa7cae1cd13f4e5c4a6d94b5e1158367abc3d1..0986fdd71545c7832a2438dc9c7ddd2e581c291e 100644 (file)
--- a/helm/gtkmathview-bonobo/test/main.c
+++ b/helm/gtkmathview-bonobo/test/main.c
@@ -4,7 +4,7 @@
 #include <glib.h>
 
 #include "control-factory.h"
-#include "GNOME_GtkMathView_View.h"
+#include "GtkMathView.h"
 
 static GtkWidget *control;