[gcalctool] Compile with -DGSEAL_ENABLE (Thomas Anderson, Bug #588591)
- From: Robert Ancell <rancell src gnome org>
- To: svn-commits-list gnome org
- Subject: [gcalctool] Compile with -DGSEAL_ENABLE (Thomas Anderson, Bug #588591)
- Date: Wed, 15 Jul 2009 00:52:47 +0000 (UTC)
commit 70e970cec32e15748be3195c2224358a43be04e0
Author: Robert Ancell <robert ancell gmail com>
Date: Wed Jul 15 10:49:03 2009 +1000
Compile with -DGSEAL_ENABLE (Thomas Anderson, Bug #588591)
ChangeLog | 4 ++++
src/gtk.c | 12 ++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ce9fad9..af10b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
gcalctool change history.
=========================
+2009-07-15 Robert Ancell <robert ancell gmail com>
+
+ * Compile with -DGSEAL_ENABLE (Thomas Anderson, Bug #588591)
+
2009-07-14 Robert Ancell <robert ancell gmail com>
* README:
diff --git a/src/gtk.c b/src/gtk.c
index 93c5339..1c971fd 100644
--- a/src/gtk.c
+++ b/src/gtk.c
@@ -1199,7 +1199,7 @@ ui_set_display(char *str, int cursor)
if (cursor < 0) {
adj = gtk_scrolled_window_get_hadjustment(
GTK_SCROLLED_WINDOW(X.scrolledwindow));
- gtk_adjustment_set_value(adj, adj->upper - adj->page_size);
+ gtk_adjustment_set_value(adj, gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj));
}
}
@@ -1310,8 +1310,8 @@ ui_set_registers_visible(gboolean visible)
gtk_widget_realize(X.register_dialog);
if (visible) {
- if (gdk_window_is_visible(X.register_dialog->window)) {
- gdk_window_raise(X.register_dialog->window);
+ if (gdk_window_is_visible(gtk_widget_get_window(X.register_dialog))) {
+ gdk_window_raise(gtk_widget_get_window(X.register_dialog));
return;
}
position_popup(X.main_window, X.register_dialog, POPUP_ABOVE);
@@ -1861,7 +1861,7 @@ save_win_position()
{
int x, y;
- (void) gdk_window_get_origin(X.main_window->window, &x, &y);
+ (void) gdk_window_get_origin(gtk_widget_get_window(X.main_window), &x, &y);
set_int_resource(R_XPOS, x);
set_int_resource(R_YPOS, y);
}
@@ -2047,7 +2047,7 @@ button_cb(GtkWidget *widget, GdkEventButton *event)
update_memory_menus();
if (event == NULL) {
- gdk_window_get_origin(widget->window, &loc.x, &loc.y);
+ gdk_window_get_origin(gtk_widget_get_window(widget), &loc.x, &loc.y);
loc.x += widget->allocation.x;
loc.y += widget->allocation.y;
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, menu_pos_func,
@@ -2670,7 +2670,7 @@ create_main_window()
X.display_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(X.display_item));
gtk_widget_ensure_style(X.display_item);
- font_desc = pango_font_description_copy(X.display_item->style->font_desc);
+ font_desc = pango_font_description_copy(gtk_widget_get_style(X.display_item)->font_desc);
pango_font_description_set_size(font_desc, 16 * PANGO_SCALE);
gtk_widget_modify_font(X.display_item, font_desc);
pango_font_description_free(font_desc);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]