summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2011-03-26 20:56:59 +0000
committerVincent Sanders <vince@netsurf-browser.org>2011-03-26 20:56:59 +0000
commite7f9e93cc6520a84016c13549f23710782db8b0b (patch)
tree750f49f21ccc9743add7ccbb92c12a2137609fe4
parentf832eea7fa7a7e146b2cd2e36a2d97f8bc0a38a3 (diff)
downloadnetsurf-e7f9e93cc6520a84016c13549f23710782db8b0b.tar.gz
netsurf-e7f9e93cc6520a84016c13549f23710782db8b0b.tar.bz2
make teh GTK frontend build on -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DPANGO_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGTK_MULTIHEAD_SAFE
svn path=/trunk/netsurf/; revision=12138
-rw-r--r--gtk/plotters.c7
-rw-r--r--gtk/print.c2
-rw-r--r--gtk/sexy_icon_entry.h3
-rw-r--r--gtk/throbber.c4
-rw-r--r--gtk/thumbnail.c2
-rw-r--r--gtk/window.c4
-rw-r--r--windows/gui.c1
7 files changed, 11 insertions, 12 deletions
diff --git a/gtk/plotters.c b/gtk/plotters.c
index 25c5dff90..0041b728c 100644
--- a/gtk/plotters.c
+++ b/gtk/plotters.c
@@ -69,8 +69,7 @@ void nsgtk_set_colour(colour c)
colour.blue = b | (b << 8);
colour.pixel = (r << 16) | (g << 8) | b;
- gdk_color_alloc(gdk_colormap_get_system(),
- &colour);
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, true, true);
gdk_gc_set_foreground(current_gc, &colour);
cairo_set_source_rgba(current_cr, r / 255.0,
@@ -89,8 +88,8 @@ void nsgtk_plot_caret(int x, int y, int h)
colour.green = 0;
colour.blue = 0;
colour.pixel = 0;
- gdk_color_alloc(gdk_colormap_get_system(),
- &colour);
+ gdk_colormap_alloc_color(gdk_colormap_get_system(),
+ &colour, true, true);
gdk_gc_set_foreground(current_gc, &colour);
gdk_draw_line(current_drawable, current_gc,
diff --git a/gtk/print.c b/gtk/print.c
index ecd9a93f3..f0f205e42 100644
--- a/gtk/print.c
+++ b/gtk/print.c
@@ -66,7 +66,7 @@ static inline void nsgtk_print_set_colour(colour c)
colour.blue = b | (b << 8);
colour.pixel = (r << 16) | (g << 8) | b;
- gdk_color_alloc(gdk_colormap_get_system(), &colour);
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, true, true);
cairo_set_source_rgba(gtk_print_current_cr, r / 255.0,
g / 255.0, b / 255.0, 1.0);
diff --git a/gtk/sexy_icon_entry.h b/gtk/sexy_icon_entry.h
index 94ba90833..bd7fb3eb9 100644
--- a/gtk/sexy_icon_entry.h
+++ b/gtk/sexy_icon_entry.h
@@ -25,8 +25,7 @@ typedef struct _SexyIconEntry SexyIconEntry;
typedef struct _SexyIconEntryClass SexyIconEntryClass;
typedef struct _SexyIconEntryPriv SexyIconEntryPriv;
-#include <gtk/gtkentry.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
#define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type())
#define SEXY_ICON_ENTRY(obj) \
diff --git a/gtk/throbber.c b/gtk/throbber.c
index 987b9dd42..8ab7dd87c 100644
--- a/gtk/throbber.c
+++ b/gtk/throbber.c
@@ -77,7 +77,7 @@ bool nsgtk_throbber_initialise_from_png(const int frames, char** frame_files)
if (errors_when_loading == true) {
for (frame_loop = 0; frame_loop < frames; frame_loop++) {
if (throb->framedata[frame_loop] != NULL)
- gdk_pixbuf_unref(throb->framedata[frame_loop]);
+ g_object_unref(throb->framedata[frame_loop]);
}
free(throb->framedata);
@@ -96,7 +96,7 @@ void nsgtk_throbber_finalise(void)
int i;
for (i = 0; i < nsgtk_throbber->nframes; i++)
- gdk_pixbuf_unref(nsgtk_throbber->framedata[i]);
+ g_object_unref(nsgtk_throbber->framedata[i]);
free(nsgtk_throbber->framedata);
free(nsgtk_throbber);
diff --git a/gtk/thumbnail.c b/gtk/thumbnail.c
index 6f9e341b2..3561ea05b 100644
--- a/gtk/thumbnail.c
+++ b/gtk/thumbnail.c
@@ -26,6 +26,8 @@
#include <assert.h>
#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
diff --git a/gtk/window.c b/gtk/window.c
index f400b825b..f15e42478 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -954,8 +954,8 @@ static GdkCursor *nsgtk_create_menu_cursor(void)
16, 16);
r = gdk_cursor_new_from_pixmap(source, mask, &fg, &bg, 0, 3);
- gdk_pixmap_unref(source);
- gdk_pixmap_unref(mask);
+ g_object_unref(source);
+ g_object_unref(mask);
return r;
}
diff --git a/windows/gui.c b/windows/gui.c
index d23a1f32e..bcc8fa28d 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -205,7 +205,6 @@ nsws_get_gui_window(HWND hwnd)
}
}
- LOG(("gw %p",gw));
return gw;
}