mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-22 22:41:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert previous two changes, as it breaks far too recent versions of GTK.

Browse Source 
svn path=/trunk/netsurf/; revision=10390
This commit is contained in:
Rob Kendrick 2010-04-13 11:22:35 +00:00
parent e7ca0aaeb0
commit 9bb36f143e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Docs/BUILDING-GTK
View File

@ -146,9 +146,9 @@
General requirements
----------------------
NetSurf requires at minimum GTK 2.18. Earlier versions will not work. It also
NetSurf requires at minimum GTK 2.12. Earlier versions will not work. It also
depends on Cairo for rendering, but you should have this already with
versions of GTK 2.18 or later.
versions of GTK 2.12 or later.
This will pull in loads of things, like all the GTK dev libraries, the PNG
and JPEG libraries, colour management libraries, zlib, OpenSSL etc that

2
gtk/gtk_download.c
View File

@ -438,7 +438,7 @@ void nsgtk_download_do(nsgtk_download_selection_action action)
gboolean nsgtk_download_update(gboolean force_update)
{
/* Be sure we need to update */
if (!gtk_widget_get_visible(GTK_WIDGET(nsgtk_download_window)))
if (!GTK_WIDGET_VISIBLE(nsgtk_download_window))
return TRUE;
GList *list;

2
gtk/gtk_scaffolding.c
View File

@ -862,7 +862,7 @@ MULTIHANDLER(selectall)
{
struct browser_window *bw = gui_window_get_browser_window(g->top_level);
if (gtk_widget_has_focus(g->url_bar)) {
if (GTK_WIDGET_HAS_FOCUS(g->url_bar)) {
LOG(("Selecting all URL bar text"));
gtk_editable_select_region(GTK_EDITABLE(g->url_bar), 0, -1);
} else {

14
gtk/sexy_icon_entry.c
View File

@ -209,7 +209,7 @@ sexy_icon_entry_destroy(GtkObject *obj)
static void
sexy_icon_entry_map(GtkWidget *widget)
{
if (gtk_widget_get_realized(widget) && !gtk_widget_get_mapped(widget))
if (GTK_WIDGET_REALIZED(widget) && !GTK_WIDGET_MAPPED(widget))
{
SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
int i;
@ -227,7 +227,7 @@ sexy_icon_entry_map(GtkWidget *widget)
static void
sexy_icon_entry_unmap(GtkWidget *widget)
{
if (gtk_widget_get_mapped(widget))
if (GTK_WIDGET_MAPPED(widget))
{
SexyIconEntry *entry = SEXY_ICON_ENTRY(widget);
int i;
@ -374,7 +374,7 @@ sexy_icon_entry_realize(GtkWidget *widget)
gdk_window_set_user_data(icon_info->window, widget);
gdk_window_set_background(icon_info->window,
&widget->style->base[gtk_widget_get_state(widget)]);
&widget->style->base[GTK_WIDGET_STATE(widget)]);
}
gtk_widget_queue_resize(widget);
@ -471,7 +471,7 @@ sexy_icon_entry_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation);
if (gtk_widget_get_realized(widget))
if (GTK_WIDGET_REALIZED(widget))
place_windows(SEXY_ICON_ENTRY(widget), allocation);
}
@ -558,7 +558,7 @@ draw_icon(GtkWidget *widget, SexyIconEntryPosition icon_pos)
GdkPixbuf *pixbuf;
gint x, y, width, height;
if (icon_info->icon == NULL || !gtk_widget_get_realized(widget))
if (icon_info->icon == NULL || !GTK_WIDGET_REALIZED(widget))
return;
if ((pixbuf = get_pixbuf_from_icon(entry, icon_pos)) == NULL)
@ -622,7 +622,7 @@ sexy_icon_entry_expose(GtkWidget *widget, GdkEventExpose *event)
entry = SEXY_ICON_ENTRY(widget);
if (gtk_widget_is_drawable(widget))
if (GTK_WIDGET_DRAWABLE(widget))
{
gboolean found = FALSE;
int i;
@ -640,7 +640,7 @@ sexy_icon_entry_expose(GtkWidget *widget, GdkEventExpose *event)
gdk_drawable_get_size(icon_info->window, &width, NULL);
gtk_paint_flat_box(widget->style, icon_info->window,
gtk_widget_get_state(widget), GTK_SHADOW_NONE,
GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
NULL, widget, "entry_bg",
0, 0, width, text_area_alloc.height);