summaryrefslogtreecommitdiff
path: root/demos/gtk-demo
diff options
context:
space:
mode:
Diffstat (limited to 'demos/gtk-demo')
-rw-r--r--demos/gtk-demo/application.c6
-rw-r--r--demos/gtk-demo/assistant.c4
-rw-r--r--demos/gtk-demo/combobox.c6
-rw-r--r--demos/gtk-demo/css_blendmodes.c2
-rw-r--r--demos/gtk-demo/dialog.c2
-rw-r--r--demos/gtk-demo/editable_cells.c18
-rw-r--r--demos/gtk-demo/expander.c2
-rw-r--r--demos/gtk-demo/filtermodel.c8
-rw-r--r--demos/gtk-demo/flowbox.c2
-rw-r--r--demos/gtk-demo/font_features.c6
-rw-r--r--demos/gtk-demo/fontplane.c14
-rw-r--r--demos/gtk-demo/gtkfishbowl.c2
-rw-r--r--demos/gtk-demo/hypertext.c16
-rw-r--r--demos/gtk-demo/iconview.c2
-rw-r--r--demos/gtk-demo/iconview_edit.c10
-rw-r--r--demos/gtk-demo/images.c10
-rw-r--r--demos/gtk-demo/infobar.c2
-rw-r--r--demos/gtk-demo/links.c2
-rw-r--r--demos/gtk-demo/list_store.c2
-rw-r--r--demos/gtk-demo/main.c15
-rw-r--r--demos/gtk-demo/overlay2.c4
-rw-r--r--demos/gtk-demo/pagesetup.c2
-rw-r--r--demos/gtk-demo/paint.c6
-rw-r--r--demos/gtk-demo/pixbufs.c4
-rw-r--r--demos/gtk-demo/printing.c12
-rw-r--r--demos/gtk-demo/revealer.c2
-rw-r--r--demos/gtk-demo/search_entry.c2
-rw-r--r--demos/gtk-demo/spinbutton.c22
-rw-r--r--demos/gtk-demo/tree_store.c14
29 files changed, 99 insertions, 100 deletions
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index cef94fca28..2b5e8e094a 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -92,7 +92,7 @@ activate_new (GSimpleAction *action,
static void
open_response_cb (GtkNativeDialog *dialog,
- gint response_id,
+ int response_id,
gpointer user_data)
{
GtkFileChooserNative *native = user_data;
@@ -245,8 +245,8 @@ update_statusbar (GtkTextBuffer *buffer,
DemoApplicationWindow *window)
{
gchar *msg;
- gint row, col;
- gint count;
+ int row, col;
+ int count;
GtkTextIter iter;
/* clear any previous message, underflow is allowed */
diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c
index 53bc8db5a4..b90e42ab55 100644
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -47,7 +47,7 @@ on_assistant_close_cancel (GtkWidget *widget, gpointer data)
static void
on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
{
- gint current_page, n_pages;
+ int current_page, n_pages;
gchar *title;
current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (widget));
@@ -70,7 +70,7 @@ on_entry_changed (GtkWidget *widget, gpointer data)
{
GtkAssistant *assistant = GTK_ASSISTANT (data);
GtkWidget *current_page;
- gint page_number;
+ int page_number;
const gchar *text;
page_number = gtk_assistant_get_current_page (assistant);
diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index 3ed180a9b5..0686eaf59b 100644
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -38,7 +38,7 @@ create_icon_store (void)
GtkTreeIter iter;
GtkListStore *store;
- gint i;
+ int i;
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
@@ -77,7 +77,7 @@ set_sensitive (GtkCellLayout *cell_layout,
gpointer data)
{
GtkTreePath *path;
- gint *indices;
+ int *indices;
gboolean sensitive;
path = gtk_tree_model_get_path (tree_model, iter);
@@ -175,7 +175,7 @@ create_capital_store (void)
GtkTreeIter iter, iter2;
GtkTreeStore *store;
- gint i;
+ int i;
store = gtk_tree_store_new (1, G_TYPE_STRING);
diff --git a/demos/gtk-demo/css_blendmodes.c b/demos/gtk-demo/css_blendmodes.c
index df791aad31..5efd3cf32b 100644
--- a/demos/gtk-demo/css_blendmodes.c
+++ b/demos/gtk-demo/css_blendmodes.c
@@ -75,7 +75,7 @@ setup_listbox (GtkBuilder *builder,
{
GtkWidget *normal_row;
GtkWidget *listbox;
- gint i;
+ int i;
normal_row = NULL;
listbox = gtk_list_box_new ();
diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index ed5e6b072e..91b1bfa8bb 100644
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -16,7 +16,7 @@ message_dialog_clicked (GtkButton *button,
gpointer user_data)
{
GtkWidget *dialog;
- static gint i = 1;
+ static int i = 1;
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index 993daff491..0cc307b160 100644
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -16,9 +16,9 @@
typedef struct
{
- gint number;
+ int number;
gchar *product;
- gint yummy;
+ int yummy;
}
Item;
@@ -74,7 +74,7 @@ add_items (void)
static GtkTreeModel *
create_items_model (void)
{
- gint i = 0;
+ int i = 0;
GtkListStore *model;
GtkTreeIter iter;
@@ -109,7 +109,7 @@ static GtkTreeModel *
create_numbers_model (void)
{
#define N_NUMBERS 10
- gint i = 0;
+ int i = 0;
GtkListStore *model;
GtkTreeIter iter;
@@ -192,7 +192,7 @@ remove_item (GtkWidget *widget, gpointer data)
if (gtk_tree_selection_get_selected (selection, NULL, &iter))
{
- gint i;
+ int i;
GtkTreePath *path;
path = gtk_tree_model_get_path (model, &iter);
@@ -211,7 +211,7 @@ separator_row (GtkTreeModel *model,
gpointer data)
{
GtkTreePath *path;
- gint idx;
+ int idx;
path = gtk_tree_model_get_path (model, iter);
idx = gtk_tree_path_get_indices (path)[0];
@@ -241,7 +241,7 @@ cell_edited (GtkCellRendererText *cell,
GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
GtkTreeIter iter;
- gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
+ int column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
gtk_tree_model_get_iter (model, &iter, path);
@@ -249,7 +249,7 @@ cell_edited (GtkCellRendererText *cell,
{
case COLUMN_ITEM_NUMBER:
{
- gint i;
+ int i;
i = gtk_tree_path_get_indices (path)[0];
g_array_index (articles, Item, i).number = atoi (new_text);
@@ -261,7 +261,7 @@ cell_edited (GtkCellRendererText *cell,
case COLUMN_ITEM_PRODUCT:
{
- gint i;
+ int i;
gchar *old_text;
gtk_tree_model_get (model, &iter, column, &old_text, -1);
diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c
index 51142b1b4d..d5dcd12cc6 100644
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -13,7 +13,7 @@
static GtkWidget *window = NULL;
static void
-response_cb (GtkDialog *dialog, gint response_id)
+response_cb (GtkDialog *dialog, int response_id)
{
gtk_window_destroy (GTK_WINDOW (window));
window = NULL;
diff --git a/demos/gtk-demo/filtermodel.c b/demos/gtk-demo/filtermodel.c
index e3a55c4f99..b1492c71ca 100644
--- a/demos/gtk-demo/filtermodel.c
+++ b/demos/gtk-demo/filtermodel.c
@@ -22,7 +22,7 @@ format_number (GtkTreeViewColumn *col,
GtkTreeIter *iter,
gpointer data)
{
- gint num;
+ int num;
gchar *text;
gtk_tree_model_get (model, iter, GPOINTER_TO_INT (data), &num, -1);
@@ -35,11 +35,11 @@ static void
filter_modify_func (GtkTreeModel *model,
GtkTreeIter *iter,
GValue *value,
- gint column,
+ int column,
gpointer data)
{
GtkTreeModelFilter *filter_model = GTK_TREE_MODEL_FILTER (model);
- gint width, height;
+ int width, height;
GtkTreeModel *child_model;
GtkTreeIter child_iter;
@@ -75,7 +75,7 @@ visible_func (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer data)
{
- gint width;
+ int width;
gtk_tree_model_get (model, iter,
WIDTH_COLUMN, &width,
diff --git a/demos/gtk-demo/flowbox.c b/demos/gtk-demo/flowbox.c
index 99f9db5175..2673e35d08 100644
--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -716,7 +716,7 @@ do_flowbox (GtkWidget *do_widget)
"YellowGreen",
NULL
};
- gint i;
+ int i;
if (!window)
{
diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c
index 98370776ea..09ca986764 100644
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -295,7 +295,7 @@ update_display (void)
GList *l;
PangoAttrList *attrs;
PangoAttribute *attr;
- gint ins, bound;
+ int ins, bound;
guint start, end;
PangoLanguage *lang;
char *font_desc;
@@ -479,7 +479,7 @@ update_script_combo (void)
{
GtkListStore *store;
hb_font_t *hb_font;
- gint i, j, k;
+ int i, j, k;
PangoFont *pango_font;
GHashTable *tags;
GHashTableIter iter;
@@ -593,7 +593,7 @@ update_script_combo (void)
static void
update_features (void)
{
- gint i, j;
+ int i, j;
GtkTreeModel *model;
GtkTreeIter iter;
guint script_index, lang_index;
diff --git a/demos/gtk-demo/fontplane.c b/demos/gtk-demo/fontplane.c
index 0a7aae6339..3836799293 100644
--- a/demos/gtk-demo/fontplane.c
+++ b/demos/gtk-demo/fontplane.c
@@ -36,11 +36,11 @@ adjustment_get_normalized_value (GtkAdjustment *adj)
static void
val_to_xy (GtkFontPlane *plane,
- gint *x,
- gint *y)
+ int *x,
+ int *y)
{
gdouble u, v;
- gint width, height;
+ int width, height;
width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
@@ -57,8 +57,8 @@ plane_snapshot (GtkWidget *widget,
GtkSnapshot *snapshot)
{
GtkFontPlane *plane = GTK_FONT_PLANE (widget);
- gint x, y;
- gint width, height;
+ int x, y;
+ int width, height;
cairo_t *cr;
val_to_xy (plane, &x, &y);
@@ -125,8 +125,8 @@ adjustment_set_normalized_value (GtkAdjustment *adj,
static void
update_value (GtkFontPlane *plane,
- gint x,
- gint y)
+ int x,
+ int y)
{
GtkWidget *widget = GTK_WIDGET (plane);
gdouble u, v;
diff --git a/demos/gtk-demo/gtkfishbowl.c b/demos/gtk-demo/gtkfishbowl.c
index ff30f1d873..dd33486e15 100644
--- a/demos/gtk-demo/gtkfishbowl.c
+++ b/demos/gtk-demo/gtkfishbowl.c
@@ -98,7 +98,7 @@ gtk_fishbowl_measure (GtkWidget *widget,
GHashTableIter iter;
gpointer key, value;
GtkFishbowlChild *child;
- gint child_min, child_nat;
+ int child_min, child_nat;
*minimum = 0;
*natural = 0;
diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c
index 7aea955920..ad753c1756 100644
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -18,7 +18,7 @@ static void
insert_link (GtkTextBuffer *buffer,
GtkTextIter *iter,
const char *text,
- gint page)
+ int page)
{
GtkTextTag *tag;
@@ -35,7 +35,7 @@ insert_link (GtkTextBuffer *buffer,
*/
static void
show_page (GtkTextBuffer *buffer,
- gint page)
+ int page)
{
GtkTextIter iter;
@@ -91,7 +91,7 @@ follow_if_link (GtkWidget *text_view,
for (tagp = tags; tagp != NULL; tagp = tagp->next)
{
GtkTextTag *tag = tagp->data;
- gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+ int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
if (page != 0)
{
@@ -134,8 +134,8 @@ key_pressed (GtkEventController *controller,
}
static void set_cursor_if_appropriate (GtkTextView *text_view,
- gint x,
- gint y);
+ int x,
+ int y);
static void
released_cb (GtkGestureClick *gesture,
@@ -183,8 +183,8 @@ static gboolean hovering_over_link = FALSE;
*/
static void
set_cursor_if_appropriate (GtkTextView *text_view,
- gint x,
- gint y)
+ int x,
+ int y)
{
GSList *tags = NULL, *tagp = NULL;
GtkTextIter iter;
@@ -196,7 +196,7 @@ set_cursor_if_appropriate (GtkTextView *text_view,
for (tagp = tags; tagp != NULL; tagp = tagp->next)
{
GtkTextTag *tag = tagp->data;
- gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+ int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
if (page != 0)
{
diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c
index e13ee749f6..cd462de844 100644
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -90,7 +90,7 @@ fill_store (GtkListStore *store)
g_dir_close (dir);
}
-static gint
+static int
sort_func (GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
diff --git a/demos/gtk-demo/iconview_edit.c b/demos/gtk-demo/iconview_edit.c
index f04a6361e8..6225230a64 100644
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -20,7 +20,7 @@ fill_store (GtkListStore *store)
{
GtkTreeIter iter;
const gchar *text[] = { "Red", "Green", "Blue", "Yellow" };
- gint i;
+ int i;
/* First clear the store */
gtk_list_store_clear (store);
@@ -60,10 +60,10 @@ set_cell_color (GtkCellLayout *cell_layout,
if (gdk_rgba_parse (&color, text))
pixel =
- ((gint)(color.red * 255)) << 24 |
- ((gint)(color.green * 255)) << 16 |
- ((gint)(color.blue * 255)) << 8 |
- ((gint)(color.alpha * 255));
+ ((int)(color.red * 255)) << 24 |
+ ((int)(color.green * 255)) << 16 |
+ ((int)(color.blue * 255)) << 8 |
+ ((int)(color.alpha * 255));
g_free (text);
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index 90684bc0ed..c034c34920 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -43,10 +43,10 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
static void
progressive_updated_callback (GdkPixbufLoader *loader,
- gint x,
- gint y,
- gint width,
- gint height,
+ int x,
+ int y,
+ int width,
+ int height,
gpointer data)
{
GtkWidget *picture;
@@ -58,7 +58,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
}
-static gint
+static int
progressive_timeout (gpointer data)
{
GtkWidget *picture;
diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c
index 3d12b26141..32f88c8eb8 100644
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -8,7 +8,7 @@
static void
on_bar_response (GtkInfoBar *info_bar,
- gint response_id,
+ int response_id,
gpointer user_data)
{
GtkWidget *dialog;
diff --git a/demos/gtk-demo/links.c b/demos/gtk-demo/links.c
index 72cab2c22e..b8afd56638 100644
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -9,7 +9,7 @@
static void
response_cb (GtkWidget *dialog,
- gint response_id,
+ int response_id,
gpointer data)
{
gtk_window_destroy (GTK_WINDOW (dialog));
diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index fb31fc5457..42f88bd9e8 100644
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -81,7 +81,7 @@ spinner_timeout (gpointer data)
static GtkTreeModel *
create_model (void)
{
- gint i = 0;
+ int i = 0;
GtkListStore *store;
GtkTreeIter iter;
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 0e3283aaa8..aea46e21ea 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -252,7 +252,6 @@ static const char *types[] =
"static",
"const ",
"void",
- "gint",
" int ",
" char ",
"gchar ",
@@ -387,11 +386,11 @@ static const char *control[] =
void
parse_chars (gchar *text,
gchar **end_ptr,
- gint *state,
+ int *state,
const char **tag,
gboolean start)
{
- gint i;
+ int i;
gchar *next_token;
/* Handle comments first */
@@ -462,7 +461,7 @@ parse_chars (gchar *text,
/* check for string */
if (text[0] == '"')
{
- gint maybe_escape = FALSE;
+ int maybe_escape = FALSE;
*end_ptr = text + 1;
*tag = "string";
@@ -525,7 +524,7 @@ void
fontify (GtkTextBuffer *source_buffer)
{
GtkTextIter start_iter, next_iter, tmp_iter;
- gint state;
+ int state;
gchar *text;
gchar *start_ptr, *end_ptr;
const char *tag;
@@ -742,7 +741,7 @@ add_data_tab (const gchar *demoname)
static void
remove_data_tabs (void)
{
- gint i;
+ int i;
for (i = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) - 1; i > 1; i--)
gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), i);
@@ -760,7 +759,7 @@ load_file (const gchar *demoname,
gboolean in_para = 0;
gchar **lines;
GBytes *bytes;
- gint i;
+ int i;
if (!g_strcmp0 (current_file, filename))
return;
@@ -1190,7 +1189,7 @@ list_demos (void)
}
}
-static gint
+static int
command_line (GApplication *app,
GApplicationCommandLine *cmdline)
{
diff --git a/demos/gtk-demo/overlay2.c b/demos/gtk-demo/overlay2.c
index 9eec7beebf..10b4476fb2 100644
--- a/demos/gtk-demo/overlay2.c
+++ b/demos/gtk-demo/overlay2.c
@@ -12,9 +12,9 @@ static void
margin_changed (GtkAdjustment *adjustment,
GtkTextView *text)
{
- gint value;
+ int value;
- value = (gint)gtk_adjustment_get_value (adjustment);
+ value = (int)gtk_adjustment_get_value (adjustment);
gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text), value);
g_object_set (tag, "pixels-above-lines", value, NULL);
}
diff --git a/demos/gtk-demo/pagesetup.c b/demos/gtk-demo/pagesetup.c
index 45f6982f6a..09150a9eb7 100644
--- a/demos/gtk-demo/pagesetup.c
+++ b/demos/gtk-demo/pagesetup.c
@@ -9,7 +9,7 @@
#include <gtk/gtkunixprint.h>
static void
-done_cb (GtkDialog *dialog, gint response, gpointer data)
+done_cb (GtkDialog *dialog, int response, gpointer data)
{
gtk_window_destroy (GTK_WINDOW (dialog));
}
diff --git a/demos/gtk-demo/paint.c b/demos/gtk-demo/paint.c
index f3ba91d244..8717330276 100644
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -55,8 +55,8 @@ static void drawing_area_set_color (DrawingArea *area,
static void
drawing_area_ensure_surface (DrawingArea *area,
- gint width,
- gint height)
+ int width,
+ int height)
{
if (!area->surface ||
cairo_image_surface_get_width (area->surface) != width ||
@@ -195,7 +195,7 @@ drawing_area_root (GtkWidget *widget)
GSimpleActionGroup *action_group;
GSimpleAction *action;
GtkWidget *toplevel;
- gint i;
+ int i;
GTK_WIDGET_CLASS (drawing_area_parent_class)->root (widget);
diff --git a/demos/gtk-demo/pixbufs.c b/demos/gtk-demo/pixbufs.c
index 1c67404e0d..c2de1bb343 100644
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -39,7 +39,7 @@ static GdkPixbuf *frame;
/* Background image */
static GdkPixbuf *background;
-static gint back_width, back_height;
+static int back_width, back_height;
/* Images */
static GdkPixbuf *images[N_IMAGES];
@@ -51,7 +51,7 @@ static GtkWidget *da;
static gboolean
load_pixbufs (GError **error)
{
- gint i;
+ int i;
if (background)
return TRUE; /* already loaded earlier */
diff --git a/demos/gtk-demo/printing.c b/demos/gtk-demo/printing.c
index bca12a0572..96232db40f 100644
--- a/demos/gtk-demo/printing.c
+++ b/demos/gtk-demo/printing.c
@@ -17,10 +17,10 @@ typedef struct
gchar *resourcename;
gdouble font_size;
- gint lines_per_page;
+ int lines_per_page;
gchar **lines;
- gint num_lines;
- gint num_pages;
+ int num_lines;
+ int num_pages;
} PrintData;
static void
@@ -55,15 +55,15 @@ begin_print (GtkPrintOperation *operation,
static void
draw_page (GtkPrintOperation *operation,
GtkPrintContext *context,
- gint page_nr,
+ int page_nr,
gpointer user_data)
{
PrintData *data = (PrintData *)user_data;
cairo_t *cr;
PangoLayout *layout;
- gint text_width, text_height;
+ int text_width, text_height;
gdouble width;
- gint line, i;
+ int line, i;
PangoFontDescription *desc;
gchar *page_str;
diff --git a/demos/gtk-demo/revealer.c b/demos/gtk-demo/revealer.c
index 0f7d097952..c3ed6b4cdd 100644
--- a/demos/gtk-demo/revealer.c
+++ b/demos/gtk-demo/revealer.c
@@ -6,7 +6,7 @@
#include <gtk/gtk.h>
-static gint count = 0;
+static int count = 0;
static guint timeout = 0;
static void
diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index aa3872b858..8905e4359b 100644
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -123,7 +123,7 @@ set_search_by (GSimpleAction *action,
static void
icon_press_cb (GtkEntry *entry,
- gint position,
+ int position,
gpointer data)
{
if (position == GTK_ENTRY_ICON_PRIMARY)
diff --git a/demos/gtk-demo/spinbutton.c b/demos/gtk-demo/spinbutton.c
index 307bb52dc1..e00dfb87de 100644
--- a/demos/gtk-demo/spinbutton.c
+++ b/demos/gtk-demo/spinbutton.c
@@ -11,7 +11,7 @@
#include <math.h>
#include <stdlib.h>
-gint
+int
spinbutton_hex_spin_input (GtkSpinButton *spin_button,
gdouble *new_val)
{
@@ -28,7 +28,7 @@ spinbutton_hex_spin_input (GtkSpinButton *spin_button,
return TRUE;
}
-gint
+int
spinbutton_hex_spin_output (GtkSpinButton *spin_button)
{
GtkAdjustment *adjustment;
@@ -40,7 +40,7 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
if (fabs (val) < 1e-5)
buf = g_strdup ("0x00");
else
- buf = g_strdup_printf ("0x%.2X", (gint) val);
+ buf = g_strdup_printf ("0x%.2X", (int) val);
if (strcmp (buf, gtk_editable_get_text (GTK_EDITABLE (spin_button))))
gtk_editable_set_text (GTK_EDITABLE (spin_button), buf);
g_free (buf);
@@ -48,15 +48,15 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
return TRUE;
}
-gint
+int
spinbutton_time_spin_input (GtkSpinButton *spin_button,
gdouble *new_val)
{
const gchar *text;
gchar **str;
gboolean found = FALSE;
- gint hours;
- gint minutes;
+ int hours;
+ int minutes;
gchar *endh;
gchar *endm;
@@ -87,7 +87,7 @@ spinbutton_time_spin_input (GtkSpinButton *spin_button,
return TRUE;
}
-gint
+int
spinbutton_time_spin_output (GtkSpinButton *spin_button)
{
GtkAdjustment *adjustment;
@@ -121,11 +121,11 @@ static const char *month[12] = {
"December"
};
-gint
+int
spinbutton_month_spin_input (GtkSpinButton *spin_button,
gdouble *new_val)
{
- gint i;
+ int i;
gchar *tmp1, *tmp2;
gboolean found = FALSE;
@@ -150,12 +150,12 @@ spinbutton_month_spin_input (GtkSpinButton *spin_button,
return TRUE;
}
-gint
+int
spinbutton_month_spin_output (GtkSpinButton *spin_button)
{
GtkAdjustment *adjustment;
gdouble value;
- gint i;
+ int i;
adjustment = gtk_spin_button_get_adjustment (spin_button);
value = gtk_adjustment_get_value (adjustment);
diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 37fcc001af..a15dbab32a 100644
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -230,7 +230,7 @@ item_toggled (GtkCellRendererToggle *cell,
GtkTreeIter iter;
gboolean toggle_item;
- gint *column;
+ int *column;
column = g_object_get_data (G_OBJECT (cell), "column");
@@ -252,7 +252,7 @@ item_toggled (GtkCellRendererToggle *cell,
static void
add_columns (GtkTreeView *treeview)
{
- gint col_offset;
+ int col_offset;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
GtkTreeModel *model = gtk_tree_view_get_model (treeview);
@@ -272,7 +272,7 @@ add_columns (GtkTreeView *treeview)
/* alex column */
renderer = gtk_cell_renderer_toggle_new ();
g_object_set (renderer, "xalign", 0.0, NULL);
- g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN);
+ g_object_set_data (G_OBJECT (renderer), "column", (int *)ALEX_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
@@ -294,7 +294,7 @@ add_columns (GtkTreeView *treeview)
/* havoc column */
renderer = gtk_cell_renderer_toggle_new ();
g_object_set (renderer, "xalign", 0.0, NULL);
- g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN);
+ g_object_set_data (G_OBJECT (renderer), "column", (int *)HAVOC_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
@@ -315,7 +315,7 @@ add_columns (GtkTreeView *treeview)
/* tim column */
renderer = gtk_cell_renderer_toggle_new ();
g_object_set (renderer, "xalign", 0.0, NULL);
- g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN);
+ g_object_set_data (G_OBJECT (renderer), "column", (int *)TIM_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
@@ -337,7 +337,7 @@ add_columns (GtkTreeView *treeview)
/* owen column */
renderer = gtk_cell_renderer_toggle_new ();
g_object_set (renderer, "xalign", 0.0, NULL);
- g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN);
+ g_object_set_data (G_OBJECT (renderer), "column", (int *)OWEN_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
@@ -358,7 +358,7 @@ add_columns (GtkTreeView *treeview)
/* dave column */
renderer = gtk_cell_renderer_toggle_new ();
g_object_set (renderer, "xalign", 0.0, NULL);
- g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN);
+ g_object_set_data (G_OBJECT (renderer), "column", (int *)DAVE_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);