Commit 47215ba4 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

removed gtk_input_add_interp.

Mon Aug 17 15:31:38 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmain.c: removed gtk_input_add_interp.

        * gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
        keyword.
        (gtk_editable_get_event_time): fix default: case.

        * gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.

        * gdk/gdkpixmap.c: made a bunch of unexported functions static.

        * gdk/gdkcolor.c:
        * gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
        of our functions.

        * various minor compilation cleanups, such as bogus commas in
        enums and similar things.

M
parent 690a18f0
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat()
......
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat()
......
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat()
......
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat()
......
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat()
......
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat()
......
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat()
......
......@@ -19,6 +19,7 @@
#include <X11/Xlib.h>
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkx.h"
static gint gdk_colormap_match_color (GdkColormap *cmap,
......
......@@ -175,7 +175,7 @@ gdk_pixmap_create_from_data (GdkWindow *window,
return pixmap;
}
gint
static gint
gdk_pixmap_seek_string (FILE *infile,
const gchar *str,
gint skip_comments)
......@@ -199,7 +199,7 @@ gdk_pixmap_seek_string (FILE *infile,
return FALSE;
}
gint
static gint
gdk_pixmap_seek_char (FILE *infile,
gchar c)
{
......@@ -231,7 +231,7 @@ gdk_pixmap_seek_char (FILE *infile,
return FALSE;
}
gint
static gint
gdk_pixmap_read_string (FILE *infile,
gchar **buffer,
guint *buffer_size)
......@@ -286,7 +286,7 @@ gdk_pixmap_read_string (FILE *infile,
return ret;
}
gchar*
static gchar*
gdk_pixmap_skip_whitespaces (gchar *buffer)
{
gint32 index = 0;
......@@ -297,7 +297,7 @@ gdk_pixmap_skip_whitespaces (gchar *buffer)
return &buffer[index];
}
gchar*
static gchar*
gdk_pixmap_skip_string (gchar *buffer)
{
gint32 index = 0;
......@@ -311,7 +311,7 @@ gdk_pixmap_skip_string (gchar *buffer)
/* Xlib crashed ince at a color name lengths around 125 */
#define MAX_COLOR_LEN 120
gchar*
static gchar*
gdk_pixmap_extract_color (gchar *buffer)
{
gint counter, numnames;
......
......@@ -20,6 +20,7 @@
#include <X11/Xutil.h>
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkx.h"
static void gdk_visual_add (GdkVisual *visual);
......
......@@ -19,6 +19,7 @@
#include <X11/Xlib.h>
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkx.h"
static gint gdk_colormap_match_color (GdkColormap *cmap,
......
......@@ -175,7 +175,7 @@ gdk_pixmap_create_from_data (GdkWindow *window,
return pixmap;
}
gint
static gint
gdk_pixmap_seek_string (FILE *infile,
const gchar *str,
gint skip_comments)
......@@ -199,7 +199,7 @@ gdk_pixmap_seek_string (FILE *infile,
return FALSE;
}
gint
static gint
gdk_pixmap_seek_char (FILE *infile,
gchar c)
{
......@@ -231,7 +231,7 @@ gdk_pixmap_seek_char (FILE *infile,
return FALSE;
}
gint
static gint
gdk_pixmap_read_string (FILE *infile,
gchar **buffer,
guint *buffer_size)
......@@ -286,7 +286,7 @@ gdk_pixmap_read_string (FILE *infile,
return ret;
}
gchar*
static gchar*
gdk_pixmap_skip_whitespaces (gchar *buffer)
{
gint32 index = 0;
......@@ -297,7 +297,7 @@ gdk_pixmap_skip_whitespaces (gchar *buffer)
return &buffer[index];
}
gchar*
static gchar*
gdk_pixmap_skip_string (gchar *buffer)
{
gint32 index = 0;
......@@ -311,7 +311,7 @@ gdk_pixmap_skip_string (gchar *buffer)
/* Xlib crashed ince at a color name lengths around 125 */
#define MAX_COLOR_LEN 120
gchar*
static gchar*
gdk_pixmap_extract_color (gchar *buffer)
{
gint counter, numnames;
......
......@@ -20,6 +20,7 @@
#include <X11/Xutil.h>
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkx.h"
static void gdk_visual_add (GdkVisual *visual);
......
......@@ -696,7 +696,7 @@ gtk_accel_group_entries_from_object (GtkObject *object)
gboolean
gtk_accelerator_valid (guint keyval,
guint modifiers)
GdkModifierType modifiers)
{
guint invalid_accelerator_vals[] = {
GDK_BackSpace, GDK_Delete, GDK_KP_Delete,
......@@ -1016,7 +1016,7 @@ gtk_accelerator_name (guint accelerator_key,
}
void
gtk_accelerator_set_default_mod_mask (guint default_mod_mask)
gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask)
{
default_accel_mod_mask = default_mod_mask & GDK_MODIFIER_MASK;
}
......
......@@ -28,7 +28,7 @@
enum {
ARG_0,
ARG_ACCEL_WIDGET,
ARG_ACCEL_WIDGET
};
static void gtk_accel_label_class_init (GtkAccelLabelClass *klass);
......
......@@ -1916,19 +1916,19 @@ gtk_clist_swap_rows (GtkCList * clist,
swap = link1->data;
link1->data = link2->data;
link2->data = swap;
list = clist->selection;
while (list)
{
if (GPOINTER_TO_INT (list->data) == row1)
GPOINTER_TO_INT (list->data) = row2;
if (GPOINTER_TO_INT (list->data) == row2)
GPOINTER_TO_INT (list->data) = row1;
list->data = GINT_TO_POINTER (row2);
if (GPOINTER_TO_INT (list->data) == row2)
list->data = GINT_TO_POINTER (row1);
list = list->next;
}
if (!GTK_CLIST_FROZEN (clist))
{
if (gtk_clist_row_is_visible (clist, row1) != GTK_VISIBILITY_NONE)
......@@ -2074,7 +2074,7 @@ gtk_clist_row_is_visible (GtkCList * clist,
return GTK_VISIBILITY_FULL;
}
GtkAdjustment *
static GtkAdjustment*
gtk_clist_get_vadjustment (GtkCList * clist)
{
g_return_val_if_fail (clist != NULL, NULL);
......@@ -2083,7 +2083,7 @@ gtk_clist_get_vadjustment (GtkCList * clist)
return gtk_range_get_adjustment (GTK_RANGE (clist->vscrollbar));
}
GtkAdjustment *
static GtkAdjustment*
gtk_clist_get_hadjustment (GtkCList * clist)
{
g_return_val_if_fail (clist != NULL, NULL);
......
......@@ -2880,12 +2880,9 @@ real_tree_expand (GtkCTree *ctree,
work = GTK_CTREE_ROW (node)->children;
if (work)
{
GtkCList *clist;
gint tmp = 0;
gint row;
clist = GTK_CLIST (ctree);
while (GTK_CTREE_NODE_NEXT (work))
{
work = GTK_CTREE_NODE_NEXT (work);
......@@ -2948,12 +2945,9 @@ real_tree_collapse (GtkCTree *ctree,
work = GTK_CTREE_ROW (node)->children;
if (work)
{
GtkCList *clist;
gint tmp = 0;
gint row;
clist = GTK_CLIST (ctree);
while (work && GTK_CTREE_ROW (work)->level > level)
{
work = GTK_CTREE_NODE_NEXT (work);
......
......@@ -522,8 +522,8 @@ gtk_editable_set_selection (GtkEditable *editable,
}
void
gtk_editable_set_position (GtkEditable *editable,
gint position)
gtk_editable_set_position (GtkEditable *editable,
gint position)
{
GtkEditableClass *klass;
......@@ -532,7 +532,7 @@ gtk_editable_set_position (GtkEditable *editable,
klass = GTK_EDITABLE_CLASS (GTK_OBJECT (editable)->klass);
return klass->set_position (editable, position);
klass->set_position (editable, position);
}
gint
......@@ -794,7 +794,7 @@ gtk_editable_select_region (GtkEditable *editable,
if (GTK_WIDGET_REALIZED (editable))
gtk_editable_claim_selection (editable, start != end, GDK_CURRENT_TIME);
gtk_editable_set_selection (editable, start, end);
}
......@@ -805,9 +805,9 @@ static guint32
gtk_editable_get_event_time (GtkEditable *editable)
{
GdkEvent *event;
event = gtk_get_current_event();
if (event)
switch (event->type)
{
......@@ -834,8 +834,9 @@ gtk_editable_get_event_time (GtkEditable *editable)
case GDK_PROXIMITY_OUT:
return event->proximity.time;
default: /* use current time */
break;
}
return GDK_CURRENT_TIME;
}
......
......@@ -36,7 +36,7 @@
enum {
ARG_0,
ARG_MAX_LENGTH,
ARG_VISIBILITY,
ARG_VISIBILITY
};
......
......@@ -385,18 +385,18 @@ static gint gtk_font_selection_dialog_on_configure(GtkWidget *widget,
static GtkWindowClass *font_selection_parent_class = NULL;
static GtkNotebookClass *font_selection_dialog_parent_class = NULL;
guint
GtkType
gtk_font_selection_get_type()
{
static guint font_selection_type = 0;
static GtkType font_selection_type = 0;
if(!font_selection_type)
{
GtkTypeInfo fontsel_info =
GtkTypeInfo fontsel_type_info =
{
"GtkFontSelection",
sizeof(GtkFontSelection),
sizeof(GtkFontSelectionClass),
sizeof (GtkFontSelection),
sizeof (GtkFontSelectionClass),
(GtkClassInitFunc) gtk_font_selection_class_init,
(GtkObjectInitFunc) gtk_font_selection_init,
/* reserved_1 */ NULL,
......@@ -404,8 +404,8 @@ gtk_font_selection_get_type()
(GtkClassInitFunc) NULL,
};
font_selection_type = gtk_type_unique (gtk_notebook_get_type(),
&fontsel_info);
font_selection_type = gtk_type_unique (GTK_TYPE_NOTEBOOK,
&fontsel_type_info);
}
return font_selection_type;
......@@ -418,7 +418,7 @@ gtk_font_selection_class_init(GtkFontSelectionClass *klass)
object_class = (GtkObjectClass *) klass;
font_selection_parent_class = gtk_type_class (gtk_notebook_get_type ());
font_selection_parent_class = gtk_type_class (GTK_TYPE_NOTEBOOK);
object_class->destroy = gtk_font_selection_destroy;
......@@ -853,7 +853,7 @@ gtk_font_selection_new()
{
GtkFontSelection *fontsel;
fontsel = gtk_type_new (gtk_font_selection_get_type ());
fontsel = gtk_type_new (GTK_TYPE_FONT_SELECTION);
return GTK_WIDGET (fontsel);
}
......@@ -3068,7 +3068,7 @@ gtk_font_selection_create_xlfd (gint size,
*****************************************************************************/
guint
gtk_font_selection_dialog_get_type (void)
gtk_font_selection_dialog_get_type (void)
{
static guint font_selection_dialog_type = 0;
......@@ -3086,7 +3086,7 @@ gtk_font_selection_dialog_get_type (void)
(GtkClassInitFunc) NULL,
};
font_selection_dialog_type = gtk_type_unique (gtk_window_get_type (), &fontsel_diag_info);
font_selection_dialog_type = gtk_type_unique (GTK_TYPE_WINDOW, &fontsel_diag_info);
}
return font_selection_dialog_type;
......@@ -3099,7 +3099,7 @@ gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass)
object_class = (GtkObjectClass*) klass;
font_selection_dialog_parent_class = gtk_type_class (gtk_window_get_type ());
font_selection_dialog_parent_class = gtk_type_class (GTK_TYPE_WINDOW);
}
static void
......@@ -3161,7 +3161,7 @@ gtk_font_selection_dialog_new (const gchar *title)
{
GtkFontSelectionDialog *fontseldiag;
fontseldiag = gtk_type_new (gtk_font_selection_dialog_get_type ());
fontseldiag = gtk_type_new (GTK_TYPE_FONT_SELECTION_DIALOG);
gtk_window_set_title (GTK_WINDOW (fontseldiag),
title ? title : "Font Selection");
......
......@@ -12,7 +12,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
......@@ -35,13 +35,17 @@ extern "C" {
#pragma }
#endif /* __cplusplus */
#define GTK_FONT_SELECTION(obj) GTK_CHECK_CAST(obj, gtk_font_selection_get_type(), GtkFontSelection)
#define GTK_FONT_SELECTION_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, gtk_font_selection_get_type(), GtkFontSelectionClass)
#define GTK_IS_FONT_SELECTION(obj) GTK_CHECK_TYPE(obj, gtk_font_selection_get_type())
#define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ())
#define GTK_FONT_SELECTION(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection))
#define GTK_FONT_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
#define GTK_IS_FONT_SELECTION(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FONT_SELECTION))
#define GTK_IS_FONT_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION))
#define GTK_FONT_SELECTION_DIALOG(obj) GTK_CHECK_CAST (obj, gtk_font_selection_dialog_get_type (), GtkFontSelectionDialog)
#define GTK_FONT_SELECTION_DIALOG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_font_selection_dialog_get_type (), GtkFontSelectionDialogClass)
#define GTK_IS_FONT_SELECTION_DIALOG(obj) GTK_CHECK_TYPE (obj, gtk_font_selection_dialog_get_type ())
#define GTK_TYPE_FONT_SELECTION_DIALOG (gtk_font_selection_dialog_get_type ())
#define GTK_FONT_SELECTION_DIALOG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialog))
#define GTK_FONT_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
#define GTK_IS_FONT_SELECTION_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FONT_SELECTION_DIALOG))
#define GTK_IS_FONT_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION_DIALOG))
typedef struct _GtkFontSelection GtkFontSelection;
typedef struct _GtkFontSelectionClass GtkFontSelectionClass;
......@@ -54,7 +58,7 @@ typedef struct _GtkFontSelectionDialogClass GtkFontSelectionDialogClass;
/* This is the number of properties which we keep in the properties array,
i.e. Weight, Slant, Set Width, Spacing, Charset & Foundry. */
#define GTK_NUM_FONT_PROPERTIES 6
#define GTK_NUM_FONT_PROPERTIES 6
/* This is the number of properties each style has i.e. Weight, Slant,
Set Width, Spacing & Charset. Note that Foundry is not included,
......@@ -73,7 +77,7 @@ typedef enum
struct _GtkFontSelection
{
GtkNotebook notebook;
/* These are on the font page. */
GtkWidget *main_vbox;
GtkWidget *font_label;
......@@ -89,41 +93,41 @@ struct _GtkFontSelection
GtkWidget *scaled_bitmaps_button;
GtkWidget *preview_entry;
GtkWidget *message_label;
/* These are on the font info page. */
GtkWidget *info_vbox;
GtkWidget *info_clist;
GtkWidget *requested_font_name;
GtkWidget *actual_font_name;
/* These are on the filter page. */
GtkWidget *filter_vbox;
GtkWidget *filter_clists[GTK_NUM_FONT_PROPERTIES];
GdkFont *font;
gint font_index;
gint style;
GtkFontMetricType metric;
/* The size is either in pixels or deci-points, depending on the metric. */
gint size;
/* This is the last size explicitly selected. When the user selects different
fonts we try to find the nearest size to this. */
gint selected_size;
/* This flag determines if scaled bitmapped fonts are acceptable. */
gboolean scale_bitmapped_fonts;
/* These are the current property settings. They are indexes into the
strings in the GtkFontSelInfo properties array. */
guint16 property_values[GTK_NUM_STYLE_PROPERTIES];
/* These hold the arrays of current filter settings for each property.
If nfilters is 0 then all values of the property are OK. If not the
filters array contains the indexes of the valid property values. */
guint16 *property_filters[GTK_NUM_FONT_PROPERTIES];
guint16 property_nfilters[GTK_NUM_FONT_PROPERTIES];
/* This flags is set to scroll the clist to the selected value as soon as
it appears. There might be a better way of doing this. */
gboolean scroll_on_expose;
......@@ -139,16 +143,16 @@ struct _GtkFontSelectionClass
struct _GtkFontSelectionDialog
{
GtkWindow window;
GtkWidget *fontsel;
GtkWidget *main_vbox;
GtkWidget *action_area;
GtkWidget *ok_button;
/* The 'Apply' button is not shown by default but you can show/hide it. */
GtkWidget *apply_button;
GtkWidget *cancel_button;
/* If the user changes the width of the dialog, we turn auto-shrink off. */
gint dialog_width;
gboolean auto_resize;
......@@ -163,7 +167,7 @@ struct _GtkFontSelectionDialogClass
/* FontSelection */
guint gtk_font_selection_get_type (void);
GtkType gtk_font_selection_get_type (void);
GtkWidget* gtk_font_selection_new (void);
/* This returns the X Logical Font Description fontname, or NULL if no font
......@@ -182,37 +186,33 @@ GdkFont* gtk_font_selection_get_font (GtkFontSelection *fontsel);
Font Description font name (anything else will be ignored), e.g.
"-adobe-courier-bold-o-normal--25-*-*-*-*-*-*-*"
It returns TRUE on success. */
gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
const gchar *fontname);
/* This returns the text in the preview entry. You should copy the returned
text if you need it. */
gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel);
gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel);
/* This sets the text in the preview entry. It will be copied by the entry,
so there's no need to g_strdup() it first. */
void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
const gchar *text);
/* FontSelectionDialog */
guint gtk_font_selection_dialog_get_type (void);
GtkType gtk_font_selection_dialog_get_type (void);
GtkWidget* gtk_font_selection_dialog_new (const gchar *title);
/* These simply call the corresponding FontSelection function. */
gchar* gtk_font_selection_dialog_get_font_name
(GtkFontSelectionDialog *fsd);
GdkFont* gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd);
gboolean gtk_font_selection_dialog_set_font_name
(GtkFontSelectionDialog *fsd,
const gchar *fontname);
gchar* gtk_font_selection_dialog_get_preview_text
(GtkFontSelectionDialog *fsd);
void gtk_font_selection_dialog_set_preview_text
(GtkFontSelectionDialog *fsd,
const gchar *text);
gchar* gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd);
GdkFont* gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd);
gboolean gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
const gchar *fontname);
gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd);
void gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
const gchar *text);
#ifdef __cplusplus
......
......@@ -319,15 +319,15 @@ gtk_item_factory_propagate_accelerator (GtkItemFactoryItem *item,
GTK_ACCEL_VISIBLE);
else
{
GSList *slist;
GSList *work;
slist = gtk_accel_group_entries_from_object (GTK_OBJECT (widget));
while (slist)
work = gtk_accel_group_entries_from_object (GTK_OBJECT (widget));
while (work)
{
GtkAccelEntry *ac_entry;
ac_entry = slist->data;
slist = slist->next;
ac_entry = work->data;
work = work->next;
if (ac_entry->accel_flags & GTK_ACCEL_VISIBLE &&
ac_entry->accel_group == ifactory->accel_group &&
ac_entry->signal_id == signal_id)
......@@ -636,7 +636,7 @@ gtk_item_factory_from_path (const gchar *path)
}
static void
gtk_item_factory_destroy (GtkObject *object)
gtk_item_factory_destroy (GtkObject *object)
{
GtkItemFactory *ifactory;
GSList *slist;
......@@ -648,14 +648,14 @@ gtk_item_factory_destroy (GtkObject *object)
if (ifactory->widget)
{
GtkObject *object;
GtkObject *dobj;
object = GTK_OBJECT (ifactory->widget);
dobj = GTK_OBJECT (ifactory->widget);
gtk_object_ref (object);
gtk_object_sink (object);
gtk_object_destroy (object);
gtk_object_unref (object);
gtk_object_ref (dobj);