Fix #99593: Fix a memory leak when XmbLookupString returns XBufferOverflow

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

diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 9c3d60384e51720f79cebb2f090a38b5920903cd..cc6ac74aa7b6c06f2f7d00e55a9ee2a992a1a157 100644 (file)
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -43,6 +43,8 @@ extern "C" {
 #define GTK_IS_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STYLE))
 #define GTK_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STYLE, GtkStyleClass))
 
+#define GTK_TYPE_BORDER             (gtk_border_get_type ())
+
 /* Some forward declarations needed to rationalize the header
  * files.
  */
@@ -54,6 +56,7 @@ typedef struct _GtkRcStyle     GtkRcStyle;
 typedef struct _GtkIconSet     GtkIconSet;
 typedef struct _GtkIconSource  GtkIconSource;
 typedef struct _GtkRcProperty  GtkRcProperty;
+typedef struct _GtkSettings    GtkSettings;
 typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
                                         const GString    *rc_string,
                                         GValue           *property_value);
@@ -181,8 +184,8 @@ struct _GtkStyleClass
                                 GdkRectangle           *area,
                                 GtkWidget              *widget,
                                 const gchar            *detail,
-                                gint                    y1,
-                                gint                    y2,
+                                gint                    y1_,
+                                gint                    y2_,
                                 gint                    x);
   void (*draw_shadow)          (GtkStyle               *style,
                                 GdkWindow              *window,
@@ -470,8 +473,8 @@ void gtk_draw_hline      (GtkStyle        *style,
 void gtk_draw_vline      (GtkStyle        *style,
                          GdkWindow       *window,
                          GtkStateType     state_type,
-                         gint             y1,
-                         gint             y2,
+                         gint             y1_,
+                         gint             y2_,
                          gint             x);
 void gtk_draw_shadow     (GtkStyle        *style,
                          GdkWindow       *window,
@@ -639,8 +642,8 @@ void gtk_paint_vline      (GtkStyle        *style,
                           GdkRectangle    *area,
                           GtkWidget       *widget,
                           const gchar     *detail,
-                          gint             y1,
-                          gint             y2,
+                          gint             y1_,
+                          gint             y2_,
                           gint             x);
 void gtk_paint_shadow     (GtkStyle        *style,
                           GdkWindow       *window,
@@ -849,8 +852,9 @@ void gtk_paint_resize_grip (GtkStyle                *style,
                             gint                height);
 
 
-GtkBorder *gtk_border_copy (const GtkBorder *border);
-void       gtk_border_free (GtkBorder       *border);
+GType      gtk_border_get_type (void);
+GtkBorder *gtk_border_copy     (const GtkBorder *border_);
+void       gtk_border_free (   GtkBorder       *border_);
 
 /* --- private API --- */
 const GValue* _gtk_style_peek_property_value (GtkStyle           *style,
@@ -858,6 +862,8 @@ const GValue* _gtk_style_peek_property_value (GtkStyle           *style,
                                              GParamSpec         *pspec,
                                              GtkRcPropertyParser parser);
 
+void _gtk_style_init_for_settings (GtkStyle    *style,
+                                  GtkSettings *settings);
 
 /* deprecated */
 #ifndef GTK_DISABLE_DEPRECATED
@@ -879,11 +885,14 @@ void gtk_paint_string     (GtkStyle        *style,
                           const gchar     *string);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-void _gtk_draw_insertion_cursor (GtkWidget        *widget,
-                                GdkDrawable      *drawable,
-                                GdkGC            *gc,
-                                GdkRectangle     *location,
-                                GtkTextDirection  dir);
+GdkGC *_gtk_get_insertion_cursor_gc (GtkWidget        *widget,
+                                    gboolean          is_primary);
+void   _gtk_draw_insertion_cursor   (GtkWidget        *widget,
+                                    GdkDrawable      *drawable,
+                                    GdkGC            *gc,
+                                    GdkRectangle     *location,
+                                    GtkTextDirection  direction,
+                                    gboolean          draw_arrow);
 
 #ifdef __cplusplus
 }