filechooserbutton: When the combo box changes, set the *file*, not the current folder

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

diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index ae4a71072a69e9bf28d32534878934e648e7c97f..55fe53f8710171adc2a8131531412fc3134a81e6 100644 (file)
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -12,17 +12,19 @@
  * 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_H__
 #define __GTK_IM_CONTEXT_H__
 
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-#include <pango/pango.h>
+
 
 G_BEGIN_DECLS
 
@@ -44,11 +46,10 @@ struct _GtkIMContext
 
 struct _GtkIMContextClass
 {
-  /* Yes, this should be GObjectClass, be we can't fix it without breaking
-   * binary compatibility - see bug #90935
-   */
-  GtkObjectClass parent_class;
+  /*< private >*/
+  GObjectClass parent_class;
 
+  /*< public >*/
   /* Signals */
   void     (*preedit_start)        (GtkIMContext *context);
   void     (*preedit_end)          (GtkIMContext *context);
@@ -82,7 +83,7 @@ struct _GtkIMContextClass
   gboolean (*get_surrounding)     (GtkIMContext   *context,
                                   gchar         **text,
                                   gint           *cursor_index);
-
+  /*< private >*/
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -94,31 +95,31 @@ struct _GtkIMContextClass
 
 GType    gtk_im_context_get_type            (void) G_GNUC_CONST;
 
-void     gtk_im_context_set_client_window   (GtkIMContext   *context,
-                                            GdkWindow      *window);
-void     gtk_im_context_get_preedit_string  (GtkIMContext   *context,
-                                            gchar         **str,
-                                            PangoAttrList **attrs,
-                                            gint           *cursor_pos);
-gboolean gtk_im_context_filter_keypress     (GtkIMContext   *context,
-                                            GdkEventKey    *event);
-void     gtk_im_context_focus_in            (GtkIMContext   *context);
-void     gtk_im_context_focus_out           (GtkIMContext   *context);
-void     gtk_im_context_reset               (GtkIMContext   *context);
-void     gtk_im_context_set_cursor_location (GtkIMContext   *context,
-                                            GdkRectangle   *area);
-void     gtk_im_context_set_use_preedit     (GtkIMContext   *context,
-                                            gboolean        use_preedit);
-void     gtk_im_context_set_surrounding     (GtkIMContext   *context,
-                                            const gchar    *text,
-                                            gint            len,
-                                            gint            cursor_index);
-gboolean gtk_im_context_get_surrounding     (GtkIMContext   *context,
-                                            gchar         **text,
-                                            gint           *cursor_index);
-gboolean gtk_im_context_delete_surrounding  (GtkIMContext   *context,
-                                            gint            offset,
-                                            gint            n_chars);
+void     gtk_im_context_set_client_window   (GtkIMContext       *context,
+                                            GdkWindow          *window);
+void     gtk_im_context_get_preedit_string  (GtkIMContext       *context,
+                                            gchar             **str,
+                                            PangoAttrList     **attrs,
+                                            gint               *cursor_pos);
+gboolean gtk_im_context_filter_keypress     (GtkIMContext       *context,
+                                            GdkEventKey        *event);
+void     gtk_im_context_focus_in            (GtkIMContext       *context);
+void     gtk_im_context_focus_out           (GtkIMContext       *context);
+void     gtk_im_context_reset               (GtkIMContext       *context);
+void     gtk_im_context_set_cursor_location (GtkIMContext       *context,
+                                            const GdkRectangle *area);
+void     gtk_im_context_set_use_preedit     (GtkIMContext       *context,
+                                            gboolean            use_preedit);
+void     gtk_im_context_set_surrounding     (GtkIMContext       *context,
+                                            const gchar        *text,
+                                            gint                len,
+                                            gint                cursor_index);
+gboolean gtk_im_context_get_surrounding     (GtkIMContext       *context,
+                                            gchar             **text,
+                                            gint               *cursor_index);
+gboolean gtk_im_context_delete_surrounding  (GtkIMContext       *context,
+                                            gint                offset,
+                                            gint                n_chars);
 
 G_END_DECLS