X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Feditabletext.c;h=a9867c86b4b4ba17c0fed987b7e675bd282dcc1c;hb=f546ac72097fabd106a0cf277d4db389b811014c;hp=5b0113967ff2f402e1137b92f3e3bcf9cd0075ac;hpb=fd7a4a56dd31d0ae06c8e17867011accecf8b7bf;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/libspi/editabletext.c b/libspi/editabletext.c index 5b01139..a9867c8 100644 --- a/libspi/editabletext.c +++ b/libspi/editabletext.c @@ -20,35 +20,20 @@ * Boston, MA 02111-1307, USA. */ -/* - * component.c : bonobo wrapper for accessible component implementation - * - */ -#include -#include +/* editabletext.c : implements the EditableText interface */ +#include #include +#include -/* - * This pulls the CORBA definitions for the "Accessibility::Accessible" server - */ -#include - -/* - * This pulls the definition of the EditableText bonobo object - */ -#include "editabletext.h" - -/* - * Static function declarations - */ +/* Static function declarations */ static void -editable_text_class_init (EditableTextClass *klass); +spi_editable_text_class_init (SpiEditableTextClass *klass); static void -editable_text_init (EditableText *editable); +spi_editable_text_init (SpiEditableText *editable); static void -editable_text_finalize (GObject *obj); +spi_editable_text_finalize (GObject *obj); static CORBA_boolean impl_setAttributes (PortableServer_Servant _servant, const CORBA_char * attributes, @@ -83,50 +68,20 @@ impl_pasteText (PortableServer_Servant _servant, static GObjectClass *parent_class; -GType -editable_text_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo tinfo = { - sizeof (EditableTextClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) editable_text_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class data */ - sizeof (EditableText), - 0, /* n preallocs */ - (GInstanceInitFunc) editable_text_init, - NULL /* value table */ - }; - - /* - * Bonobo_type_unique auto-generates a load of - * CORBA structures for us. All derived types must - * use bonobo_type_unique. - */ - type = bonobo_type_unique ( - TEXT_TYPE, - POA_Accessibility_EditableText__init, - NULL, - G_STRUCT_OFFSET (EditableTextClass, epv), - &tinfo, - "AccessibleEditableText"); - } - - return type; -} + +BONOBO_TYPE_FUNC_FULL (SpiEditableText, + Accessibility_EditableText, + SPI_TEXT_TYPE, + spi_editable_text); static void -editable_text_class_init (EditableTextClass *klass) +spi_editable_text_class_init (SpiEditableTextClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; POA_Accessibility_EditableText__epv *epv = &klass->epv; parent_class = g_type_interface_peek_parent (klass); - object_class->finalize = editable_text_finalize; + object_class->finalize = spi_editable_text_finalize; /* Initialize epv table */ @@ -140,22 +95,22 @@ editable_text_class_init (EditableTextClass *klass) } static void -editable_text_init (EditableText *editable) +spi_editable_text_init (SpiEditableText *editable) { } static void -editable_text_finalize (GObject *obj) +spi_editable_text_finalize (GObject *obj) { parent_class->finalize (obj); } -EditableText * -editable_text_interface_new (AtkObject *obj) +SpiEditableText * +spi_editable_text_interface_new (AtkObject *obj) { - EditableText *new_editable = - EDITABLE_TEXT(g_object_new (EDITABLE_TEXT_TYPE, NULL)); - (TEXT (new_editable))->atko = obj; + SpiEditableText *new_editable = + SPI_EDITABLE_TEXT(g_object_new (SPI_EDITABLE_TEXT_TYPE, NULL)); + (SPI_TEXT (new_editable))->atko = obj; g_object_ref (obj); return new_editable; } @@ -167,31 +122,31 @@ impl_setAttributes (PortableServer_Servant _servant, const CORBA_long endPos, CORBA_Environment * ev) { - EditableText *editable; + SpiEditableText *editable; BonoboObject *obj; obj = (bonobo_object_from_servant (_servant)); - g_return_if_fail (IS_EDITABLE_TEXT (obj)); - editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant)); - g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko)); + g_return_val_if_fail (IS_SPI_EDITABLE_TEXT (obj), FALSE); + editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant)); + g_return_val_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko), FALSE); g_print ("setRunAttributes not implemented.\n"); -} - + return FALSE; +} static void impl_setTextContents (PortableServer_Servant _servant, const CORBA_char * newContents, CORBA_Environment * ev) { - EditableText *editable; + SpiEditableText *editable; BonoboObject *obj; obj = (bonobo_object_from_servant (_servant)); - g_return_if_fail (IS_EDITABLE_TEXT (obj)); - editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant)); - g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko)); + g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj)); + editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant)); + g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko)); - atk_editable_text_set_text_contents (ATK_EDITABLE_TEXT( TEXT (editable)->atko), + atk_editable_text_set_text_contents (ATK_EDITABLE_TEXT( SPI_TEXT (editable)->atko), (gchar *) newContents); } @@ -204,14 +159,14 @@ impl_insertText (PortableServer_Servant _servant, const CORBA_long length, CORBA_Environment * ev) { - EditableText *editable; + SpiEditableText *editable; BonoboObject *obj; obj = (bonobo_object_from_servant (_servant)); - g_return_if_fail (IS_EDITABLE_TEXT (obj)); - editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant)); - g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko)); + g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj)); + editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant)); + g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko)); - atk_editable_text_insert_text (ATK_EDITABLE_TEXT( TEXT (editable)->atko), + atk_editable_text_insert_text (ATK_EDITABLE_TEXT( SPI_TEXT (editable)->atko), (gchar *) text, (gint) length, (gint *) &position); @@ -223,14 +178,14 @@ impl_copyText (PortableServer_Servant _servant, const CORBA_long startPos, const CORBA_long endPos, CORBA_Environment * ev) { - EditableText *editable; + SpiEditableText *editable; BonoboObject *obj; obj = (bonobo_object_from_servant (_servant)); - g_return_if_fail (IS_EDITABLE_TEXT (obj)); - editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant)); - g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko)); + g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj)); + editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant)); + g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko)); - atk_editable_text_copy_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko), + atk_editable_text_copy_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko), (gint) startPos, (gint) endPos); } @@ -241,14 +196,14 @@ impl_cutText (PortableServer_Servant _servant, const CORBA_long startPos, const CORBA_long endPos, CORBA_Environment * ev) { - EditableText *editable; + SpiEditableText *editable; BonoboObject *obj; obj = (bonobo_object_from_servant (_servant)); - g_return_if_fail (IS_EDITABLE_TEXT (obj)); - editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant)); - g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko)); + g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj)); + editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant)); + g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko)); - atk_editable_text_cut_text (ATK_EDITABLE_TEXT(TEXT (editable)->atko), + atk_editable_text_cut_text (ATK_EDITABLE_TEXT(SPI_TEXT (editable)->atko), (gint) startPos, (gint) endPos); } @@ -260,14 +215,14 @@ impl_deleteText (PortableServer_Servant _servant, const CORBA_long startPos, const CORBA_long endPos, CORBA_Environment * ev) { - EditableText *editable; + SpiEditableText *editable; BonoboObject *obj; obj = (bonobo_object_from_servant (_servant)); - g_return_if_fail (IS_EDITABLE_TEXT (obj)); - editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant)); - g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko)); + g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj)); + editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant)); + g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko)); - atk_editable_text_delete_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko), + atk_editable_text_delete_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko), (gint) startPos, (gint) endPos); } @@ -276,13 +231,13 @@ static void impl_pasteText (PortableServer_Servant _servant, const CORBA_long position, CORBA_Environment * ev) { - EditableText *editable; + SpiEditableText *editable; BonoboObject *obj; obj = (bonobo_object_from_servant (_servant)); - g_return_if_fail (IS_EDITABLE_TEXT (obj)); - editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant)); - g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko)); + g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj)); + editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant)); + g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko)); - atk_editable_text_paste_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko), position); + atk_editable_text_paste_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko), position); }