[gtkmm] Fix the build for latest git master, and add ComboBox::popup_for_device().
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Fix the build for latest git master, and add ComboBox::popup_for_device().
- Date: Wed, 16 Jun 2010 20:11:00 +0000 (UTC)
commit 3fa0a09a60cf085361360c0f1354bcd2d5eec4ac
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Jun 16 21:54:24 2010 +0200
Fix the build for latest git master, and add ComboBox::popup_for_device().
* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
* gtk/src/calendar.hg: select_month, mark_day(), unmark_day().
* gtk/src/combobox.hg: Added popup_for_device().
These are only in gtk 3, not gtk 2.2.
ChangeLog | 9 +++++++++
gtk/src/calendar.hg | 6 +++---
gtk/src/combobox.hg | 1 +
gtk/src/gtk_methods.defs | 36 +++++++++++++++++++++++++++---------
4 files changed, 40 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cbe3fa2..97fdc07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-16 Murray Cumming <murrayc murrayc com>
+
+ Fix the build for latest git master, and add ComboBox::popup_for_device().
+
+ * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+ * gtk/src/calendar.hg: select_month, mark_day(), unmark_day().
+ * gtk/src/combobox.hg: Added popup_for_device().
+ These are only in gtk 3, not gtk 2.2.
+
2010-06-13 Murray Cumming <murrayc murrayc com>
IconTheme: Add back get_for_screen().
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index bcf3369..77a5640 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -56,10 +56,10 @@ class Calendar : public Widget
public:
_CTOR_DEFAULT
- _WRAP_METHOD(int select_month(guint month, guint year), gtk_calendar_select_month)
+ _WRAP_METHOD(void select_month(guint month, guint year), gtk_calendar_select_month)
_WRAP_METHOD(void select_day(guint day), gtk_calendar_select_day)
- _WRAP_METHOD(int mark_day(guint day), gtk_calendar_mark_day)
- _WRAP_METHOD(int unmark_day(guint day), gtk_calendar_unmark_day)
+ _WRAP_METHOD(void mark_day(guint day), gtk_calendar_mark_day)
+ _WRAP_METHOD(void unmark_day(guint day), gtk_calendar_unmark_day)
_WRAP_METHOD(void clear_marks(), gtk_calendar_clear_marks)
_IGNORE(gtk_calendar_display_options) //deprecated
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 4b60ed3..97e5f50 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -140,6 +140,7 @@ public:
_WRAP_METHOD(SensitivityType get_button_sensitivity() const, gtk_combo_box_get_button_sensitivity)
_WRAP_METHOD(void popup(), gtk_combo_box_popup)
+ _WRAP_METHOD(void popup_for_device(const Glib::RefPtr<Gdk::Device>& device), gtk_combo_box_popup_for_device)
_WRAP_METHOD(void popdown(), gtk_combo_box_popdown)
_WRAP_METHOD(Glib::RefPtr<Atk::Object> get_popup_accessible(), gtk_combo_box_get_popup_accessible, ifdef GTKMM_ATKMM_ENABLED)
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index e572b79..3295e0d 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -3973,9 +3973,9 @@
(is-constructor-of "GtkApplication")
(return-type "GtkApplication*")
(parameters
+ '("const-gchar*" "appid")
'("gint*" "argc")
'("gchar***" "argv")
- '("const-gchar*" "appid")
)
)
@@ -5049,7 +5049,7 @@
(define-method select_month
(of-object "GtkCalendar")
(c-name "gtk_calendar_select_month")
- (return-type "gboolean")
+ (return-type "none")
(parameters
'("guint" "month")
'("guint" "year")
@@ -5068,7 +5068,7 @@
(define-method mark_day
(of-object "GtkCalendar")
(c-name "gtk_calendar_mark_day")
- (return-type "gboolean")
+ (return-type "none")
(parameters
'("guint" "day")
)
@@ -5077,7 +5077,7 @@
(define-method unmark_day
(of-object "GtkCalendar")
(c-name "gtk_calendar_unmark_day")
- (return-type "gboolean")
+ (return-type "none")
(parameters
'("guint" "day")
)
@@ -10558,6 +10558,18 @@
)
)
+(define-method load_symbolic_for_style
+ (of-object "GtkIconInfo")
+ (c-name "gtk_icon_info_load_symbolic_for_style")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GtkStyle*" "style")
+ '("GtkStateType" "state")
+ '("gboolean*" "was_symbolic")
+ '("GError**" "error")
+ )
+)
+
(define-method set_raw_coordinates
(of-object "GtkIconInfo")
(c-name "gtk_icon_info_set_raw_coordinates")
@@ -12606,11 +12618,11 @@
(c-name "gtk_init_with_args")
(return-type "gboolean")
(parameters
- '("int*" "argc")
- '("char***" "argv")
- '("const-char*" "parameter_string")
- '("GOptionEntry*" "entries")
- '("const-char*" "translation_domain")
+ '("gint*" "argc")
+ '("gchar***" "argv")
+ '("const-gchar*" "parameter_string")
+ '("const-GOptionEntry*" "entries")
+ '("const-gchar*" "translation_domain")
'("GError**" "error")
)
)
@@ -27029,6 +27041,12 @@
(return-type "GdkWindow*")
)
+(define-method get_view_window
+ (of-object "GtkViewport")
+ (c-name "gtk_viewport_get_view_window")
+ (return-type "GdkWindow*")
+)
+
;; From gtkvolumebutton.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]