[gtk+/resolution-independence: 57/60] Merge commit 'origin/master' into resolution-independence
- From: Davyd Madeley <davyd src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtk+/resolution-independence: 57/60] Merge commit 'origin/master' into resolution-independence
- Date: Mon, 18 May 2009 00:14:44 -0400 (EDT)
commit 79c9a7ec5e0c5c41b07af1f3a594e84ff6442a82
Merge: b89a059... 94b63ec...
Author: Davyd Madeley <davyd madeley id au>
Date: Mon May 18 10:46:31 2009 +0800
Merge commit 'origin/master' into resolution-independence
NEWS | 11 +
configure.in | 23 +
demos/gtk-demo/Makefile.am | 3 +-
demos/gtk-demo/links.c | 85 +
docs/reference/gtk/Makefile.am | 11 +-
docs/reference/gtk/gtk-docs.sgml | 5 +
docs/reference/gtk/gtk-sections.txt | 1 +
docs/reference/gtk/migrating-GtkLabel-links.sgml | 24 +
docs/reference/gtk/tmpl/gtklabel.sgml | 18 +
gdk/x11/gdkevents-x11.c | 5 +-
gdk/x11/gdkwindow-x11.c | 15 +-
gdk/x11/gdkxid.c | 13 +-
gtk/Makefile.am | 8 +
gtk/gtk.symbols | 1 +
gtk/gtkclipboard.c | 1 +
gtk/gtkfilechooserdefault.c | 9 +-
gtk/gtklabel.c | 1546 +++++++++++++---
gtk/gtklabel.h | 6 +-
gtk/gtkprintjob.c | 2 +
gtk/gtkprintjob.h | 2 +
gtk/gtkprintoperation-private.h | 5 +
gtk/gtkprintoperation-unix.c | 24 +-
gtk/gtkprintoperation-win32.c | 4 +
gtk/gtkprintoperation.c | 415 ++++-
gtk/gtkprintunixdialog.c | 72 +-
gtk/gtkselection.c | 12 +-
gtk/updateiconcache.c | 10 +-
modules/printbackends/Makefile.am | 4 +
modules/printbackends/cups/gtkcupsutils.c | 3 +-
modules/printbackends/file/gtkprintbackendfile.c | 6 +
modules/printbackends/lpr/gtkprintbackendlpr.c | 13 +-
modules/printbackends/papi/Makefile.am | 32 +
modules/printbackends/papi/gtkprintbackendpapi.c | 862 +++++++++
modules/printbackends/papi/gtkprintbackendpapi.h | 44 +
modules/printbackends/papi/gtkprinterpapi.c | 116 ++
modules/printbackends/papi/gtkprinterpapi.h | 61 +
po/da.po | 2195 +++++++++++-----------
po/de.po | 2150 +++++++++++-----------
po/el.po | 2140 +++++++++++-----------
po/es.po | 2191 +++++++++++-----------
tests/testgtk.c | 48 +
tests/testgtkrc | 8 +
tests/testmerge.c | 9 +-
tests/testvolumebutton.c | 6 +-
44 files changed, 7586 insertions(+), 4633 deletions(-)
diff --cc gtk/gtklabel.c
index ce0c41d,ea963b1..7115a55
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@@ -162,7 -224,7 +224,8 @@@ static void gtk_label_hierarchy_change
GtkWidget *old_toplevel);
static void gtk_label_screen_changed (GtkWidget *widget,
GdkScreen *old_screen);
+static void gtk_label_unit_changed (GtkWidget *widget);
+ static gboolean gtk_label_popup_menu (GtkWidget *widget);
static void gtk_label_create_window (GtkLabel *label);
static void gtk_label_destroy_window (GtkLabel *label);
@@@ -278,7 -357,8 +358,9 @@@ gtk_label_class_init (GtkLabelClass *cl
widget_class->mnemonic_activate = gtk_label_mnemonic_activate;
widget_class->drag_data_get = gtk_label_drag_data_get;
widget_class->grab_focus = gtk_label_grab_focus;
+ widget_class->unit_changed = gtk_label_unit_changed;
+ widget_class->popup_menu = gtk_label_popup_menu;
+ widget_class->focus = gtk_label_focus;
class->move_cursor = gtk_label_move_cursor;
class->copy_clipboard = gtk_label_copy_clipboard;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]