Merge commit 'origin'

[~andy/gtk] / gtk / gtkimcontextsimple.h

diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index 58f1b9507795050b09deee8eda99b0fd068232c2..8017c314f8af751a713b163f8b05045bebf79187 100644 (file)
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -17,14 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_IM_CONTEXT_SIMPLE_H__
 #define __GTK_IM_CONTEXT_SIMPLE_H__
 
 #include <gtk/gtkimcontext.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_IM_CONTEXT_SIMPLE              (gtk_im_context_simple_get_type ())
@@ -39,18 +42,19 @@ typedef struct _GtkIMContextSimple       GtkIMContextSimple;
 typedef struct _GtkIMContextSimpleClass  GtkIMContextSimpleClass;
 
 #define GTK_MAX_COMPOSE_LEN 7
-  
+
 struct _GtkIMContextSimple
 {
   GtkIMContext object;
 
-  GSList *tables;
-  
-  guint compose_buffer[GTK_MAX_COMPOSE_LEN + 1];
-  gunichar tentative_match;
-  gint tentative_match_len;
+  GSList *GSEAL (tables);
 
-  guint in_hex_sequence : 1;
+  guint GSEAL (compose_buffer[GTK_MAX_COMPOSE_LEN + 1]);
+  gunichar GSEAL (tentative_match);
+  gint GSEAL (tentative_match_len);
+
+  guint GSEAL (in_hex_sequence) : 1;
+  guint GSEAL (modifiers_dropped) : 1;
 };
 
 struct _GtkIMContextSimpleClass
@@ -65,9 +69,9 @@ void          gtk_im_context_simple_add_table (GtkIMContextSimple *context_simpl
                                               guint16            *data,
                                               gint                max_seq_len,
                                               gint                n_seqs);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+
+G_END_DECLS
 
 
 #endif /* __GTK_IM_CONTEXT_SIMPLE_H__ */