X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkeditable.h;h=0e2441c4df6c4ed9261d2c307435aa8151d12e69;hb=e09957a47da9425cc26d1b33cb4e9cc3e92e9ac7;hp=e3cab269e11c4536f824e1440ea174532564c0d9;hpb=eff99c282cb6967f4b1df2f2b53f2bbb034ce79a;p=~andy%2Fgtk
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index e3cab269e..0e2441c4d 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -12,49 +12,45 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __GTK_EDITABLE_H__
#define __GTK_EDITABLE_H__
-#include
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
+
G_BEGIN_DECLS
#define GTK_TYPE_EDITABLE (gtk_editable_get_type ())
#define GTK_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable))
-#define GTK_EDITABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_EDITABLE, GtkEditableClass))
#define GTK_IS_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EDITABLE))
-#define GTK_IS_EDITABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_EDITABLE))
-#define GTK_EDITABLE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_EDITABLE, GtkEditableClass))
+#define GTK_EDITABLE_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_EDITABLE, GtkEditableInterface))
-typedef struct _GtkEditable GtkEditable; /* Dummy typedef */
-typedef struct _GtkEditableClass GtkEditableClass;
+typedef struct _GtkEditable GtkEditable; /* Dummy typedef */
+typedef struct _GtkEditableInterface GtkEditableInterface;
-struct _GtkEditableClass
+struct _GtkEditableInterface
{
GTypeInterface base_iface;
-
+
/* signals */
void (* insert_text) (GtkEditable *editable,
- const gchar *text,
- gint length,
+ const gchar *new_text,
+ gint new_text_length,
gint *position);
void (* delete_text) (GtkEditable *editable,
gint start_pos,
@@ -63,8 +59,8 @@ struct _GtkEditableClass
/* vtable */
void (* do_insert_text) (GtkEditable *editable,
- const gchar *text,
- gint length,
+ const gchar *new_text,
+ gint new_text_length,
gint *position);
void (* do_delete_text) (GtkEditable *editable,
gint start_pos,
@@ -86,11 +82,11 @@ struct _GtkEditableClass
GType gtk_editable_get_type (void) G_GNUC_CONST;
void gtk_editable_select_region (GtkEditable *editable,
- gint start,
- gint end);
+ gint start_pos,
+ gint end_pos);
gboolean gtk_editable_get_selection_bounds (GtkEditable *editable,
- gint *start,
- gint *end);
+ gint *start_pos,
+ gint *end_pos);
void gtk_editable_insert_text (GtkEditable *editable,
const gchar *new_text,
gint new_text_length,