X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkimmulticontext.h;h=1979bf673c10c6c0313ed7f4bfd04a0e65d962b8;hb=563eb60666d9f72c38d7542b0ab37841e6aac488;hp=94a67d4a5433bee16929ec217967ab9f76bd5d20;hpb=afee2c67c5091539cbe6270b14e7e74b2a7b60a7;p=~andy%2Fgtk

diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index 94a67d4a5..1979bf673 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -12,50 +12,62 @@
  * 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_MULTICONTEXT_H__
 #define __GTK_IM_MULTICONTEXT_H__
 
-#include <gtk/gtkimcontext.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gtk/gtkimcontext.h>
+#include <gtk/gtkmenushell.h>
 
+G_BEGIN_DECLS
 
 #define GTK_TYPE_IM_MULTICONTEXT              (gtk_im_multicontext_get_type ())
-#define GTK_IM_MULTICONTEXT(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext))
-#define GTK_IM_MULTICONTEXT_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
-#define GTK_IS_IM_MULTICONTEXT(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_MULTICONTEXT))
-#define GTK_IS_IM_MULTICONTEXT_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_MULTICONTEXT))
-#define GTK_IM_MULTICONTEXT_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
+#define GTK_IM_MULTICONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext))
+#define GTK_IM_MULTICONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
+#define GTK_IS_IM_MULTICONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_MULTICONTEXT))
+#define GTK_IS_IM_MULTICONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_MULTICONTEXT))
+#define GTK_IM_MULTICONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
 
 
-typedef struct _GtkIMMulticontext       GtkIMMulticontext;
-typedef struct _GtkIMMulticontextClass  GtkIMMulticontextClass;
+typedef struct _GtkIMMulticontext        GtkIMMulticontext;
+typedef struct _GtkIMMulticontextClass   GtkIMMulticontextClass;
+typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
 
 struct _GtkIMMulticontext
 {
   GtkIMContext object;
 
-  GtkIMContext *slave;
+  /*< private >*/
+  GtkIMMulticontextPrivate *priv;
 };
 
 struct _GtkIMMulticontextClass
 {
   GtkIMContextClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GtkType       gtk_im_multicontext_get_type (void);
+GType         gtk_im_multicontext_get_type (void) G_GNUC_CONST;
 GtkIMContext *gtk_im_multicontext_new      (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
+						    GtkMenuShell      *menushell);
+const char  * gtk_im_multicontext_get_context_id   (GtkIMMulticontext *context);
 
+void          gtk_im_multicontext_set_context_id   (GtkIMMulticontext *context,
+                                                    const char        *context_id);
+ 
+G_END_DECLS
 
 #endif /* __GTK_IM_MULTICONTEXT_H__ */