filechooserbutton: Don't duplicate tests for GTK_RESPONSE_DELETE_EVENT

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

diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index 58f1b9507795050b09deee8eda99b0fd068232c2..ddb467944fb7b7d3161e839c5f092a044388553a 100644 (file)
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -12,20 +12,27 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_IM_CONTEXT_SIMPLE_H__
 #define __GTK_IM_CONTEXT_SIMPLE_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkimcontext.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
 
+G_BEGIN_DECLS
+
+/**
+ * GTK_MAX_COMPOSE_LEN:
+ *
+ * The maximum length of sequences in compose tables.
+ */
+#define GTK_MAX_COMPOSE_LEN 7
 
 #define GTK_TYPE_IM_CONTEXT_SIMPLE              (gtk_im_context_simple_get_type ())
 #define GTK_IM_CONTEXT_SIMPLE(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimple))
@@ -35,22 +42,16 @@ extern "C" {
 #define GTK_IM_CONTEXT_SIMPLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
 
 
-typedef struct _GtkIMContextSimple       GtkIMContextSimple;
-typedef struct _GtkIMContextSimpleClass  GtkIMContextSimpleClass;
+typedef struct _GtkIMContextSimple              GtkIMContextSimple;
+typedef struct _GtkIMContextSimplePrivate       GtkIMContextSimplePrivate;
+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;
-
-  guint in_hex_sequence : 1;
+  /*< private >*/
+  GtkIMContextSimplePrivate *priv;
 };
 
 struct _GtkIMContextSimpleClass
@@ -65,9 +66,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__ */