summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-10-08 05:07:55 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-10-08 05:07:55 +0000
commit07e7719441f5927bc3c482717fc53f8529186e3a (patch)
tree4baea8ab1c47987dc80120c67cb16be141a16b8d /demos
parente4581869b4a93ab882439673159a8f77b2396e57 (diff)
downloadgtk+-07e7719441f5927bc3c482717fc53f8529186e3a.tar.gz
Apply a cleanup patch by Kjartan Maraas (#341812)
2006-10-08 Matthias Clasen <mclasen@redhat.com> * Apply a cleanup patch by Kjartan Maraas (#341812)
Diffstat (limited to 'demos')
-rw-r--r--demos/gtk-demo/appwindow.c2
-rw-r--r--demos/gtk-demo/hypertext.c9
-rw-r--r--demos/testpixbuf-drawable.c2
-rw-r--r--demos/testpixbuf.c4
4 files changed, 7 insertions, 10 deletions
diff --git a/demos/gtk-demo/appwindow.c b/demos/gtk-demo/appwindow.c
index 5adaccf283..6e0f36ecb7 100644
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -156,7 +156,7 @@ typedef struct
GtkActionClass parent_class;
} ToolMenuActionClass;
-G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION);
+G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION)
static void
tool_menu_action_class_init (ToolMenuActionClass *class)
diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c
index 375ccddb66..35a1331911 100644
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -165,9 +165,9 @@ event_after (GtkWidget *text_view,
return FALSE;
}
-gboolean hovering_over_link = FALSE;
-GdkCursor *hand_cursor = NULL;
-GdkCursor *regular_cursor = NULL;
+static gboolean hovering_over_link = FALSE;
+static GdkCursor *hand_cursor = NULL;
+static GdkCursor *regular_cursor = NULL;
/* Looks at all tags covering the position (x, y) in the text view,
* and if one of them is a link, change the cursor to the "hands" cursor
@@ -179,12 +179,9 @@ set_cursor_if_appropriate (GtkTextView *text_view,
gint y)
{
GSList *tags = NULL, *tagp = NULL;
- GtkTextBuffer *buffer;
GtkTextIter iter;
gboolean hovering = FALSE;
- buffer = gtk_text_view_get_buffer (text_view);
-
gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
tags = gtk_text_iter_get_tags (&iter);
diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index 04114fd6b0..bcfc8c883a 100644
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -66,7 +66,7 @@ configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
return FALSE;
}
-extern void pixbuf_init ();
+extern void pixbuf_init (void);
int
main (int argc, char **argv)
diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index f84ebc2f8a..676171bb43 100644
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -358,11 +358,11 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
static void
config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
{
+#if 0
GdkPixbuf *pixbuf;
pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-#if 0
if (((event->width) != gdk_pixbuf_get_width (pixbuf)) ||
((event->height) != gdk_pixbuf_get_height (pixbuf)))
gdk_pixbuf_scale (pixbuf, event->width, event->height);
@@ -504,7 +504,7 @@ progressive_updated_callback (GdkPixbufLoader* loader, guint x, guint y, guint w
static int readlen = 4096;
-extern void pixbuf_init ();
+extern void pixbuf_init (void);
void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
{