[gtkmm] Move resize_grip methods from Statusbar to Window.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Move resize_grip methods from Statusbar to Window.
- Date: Thu, 14 Oct 2010 10:43:27 +0000 (UTC)
commit 55d4851bacbeb262d99a17eb5e88d22362b72767
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Oct 14 12:38:58 2010 +0200
Move resize_grip methods from Statusbar to Window.
* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
* gtk/src/statusbar.hg: Remove get/set_has_resize_grip().
* gtk/src/window.hg: Added get/set_has_resize_grip(),
get_resize_grip_is_visible(), get_resize_grip_area().
ChangeLog | 9 ++
gtk/src/gtk_methods.defs | 335 ++++++++++++++++++++++++++++++++++------------
gtk/src/statusbar.hg | 5 +-
gtk/src/window.hg | 7 +
4 files changed, 269 insertions(+), 87 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8dc982c..cf4578a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2010-10-14 Murray Cumming <murrayc murrayc com>
+ Move resize_grip methods from Statusbar to Window.
+
+ * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+ * gtk/src/statusbar.hg: Remove get/set_has_resize_grip().
+ * gtk/src/window.hg: Added get/set_has_resize_grip(),
+ get_resize_grip_is_visible(), get_resize_grip_area().
+
+2010-10-14 Murray Cumming <murrayc murrayc com>
+
Remove ComboBoxEntry and ComboBoxEntryText.
* gtk/src/comboboxentry.[h|ccg]: Remove this because it has been replaced
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 5900365..fa03f8a 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -659,6 +659,13 @@
(gtype-id "GTK_TYPE_TABLE")
)
+(define-object SpreadTable
+ (in-module "Gtk")
+ (parent "GtkContainer")
+ (c-name "GtkSpreadTable")
+ (gtype-id "GTK_TYPE_SPREAD_TABLE")
+)
+
(define-object Socket
(in-module "Gtk")
(parent "GtkContainer")
@@ -1982,39 +1989,6 @@
)
)
-(define-enum WrapAllocationMode
- (in-module "Gtk")
- (c-name "GtkWrapAllocationMode")
- (gtype-id "GTK_TYPE_WRAP_ALLOCATION_MODE")
- (values
- '("free" "GTK_WRAP_ALLOCATE_FREE")
- '("aligned" "GTK_WRAP_ALLOCATE_ALIGNED")
- '("homogeneous" "GTK_WRAP_ALLOCATE_HOMOGENEOUS")
- )
-)
-
-(define-enum WrapBoxSpreading
- (in-module "Gtk")
- (c-name "GtkWrapBoxSpreading")
- (gtype-id "GTK_TYPE_WRAP_BOX_SPREADING")
- (values
- '("start" "GTK_WRAP_BOX_SPREAD_START")
- '("end" "GTK_WRAP_BOX_SPREAD_END")
- '("even" "GTK_WRAP_BOX_SPREAD_EVEN")
- '("expand" "GTK_WRAP_BOX_SPREAD_EXPAND")
- )
-)
-
-(define-flags WrapBoxPacking
- (in-module "Gtk")
- (c-name "GtkWrapBoxPacking")
- (gtype-id "GTK_TYPE_WRAP_BOX_PACKING")
- (values
- '("h-expand" "GTK_WRAP_BOX_H_EXPAND")
- '("v-expand" "GTK_WRAP_BOX_V_EXPAND")
- )
-)
-
(define-enum FileChooserAction
(in-module "Gtk")
(c-name "GtkFileChooserAction")
@@ -3718,7 +3692,7 @@
(define-function gtk_adjustment_new
(c-name "gtk_adjustment_new")
(is-constructor-of "GtkAdjustment")
- (return-type "GObject*")
+ (return-type "GtkAdjustment*")
(parameters
'("gdouble" "value")
'("gdouble" "lower")
@@ -6519,6 +6493,11 @@
(return-type "GtkWidget*")
)
+(define-function gtk_combo_box_new_with_entry
+ (c-name "gtk_combo_box_new_with_entry")
+ (return-type "GtkWidget*")
+)
+
(define-function gtk_combo_box_new_with_model
(c-name "gtk_combo_box_new_with_model")
(return-type "GtkWidget*")
@@ -6697,6 +6676,27 @@
(return-type "GtkSensitivityType")
)
+(define-method get_has_entry
+ (of-object "GtkComboBox")
+ (c-name "gtk_combo_box_get_has_entry")
+ (return-type "gboolean")
+)
+
+(define-method set_entry_text_column
+ (of-object "GtkComboBox")
+ (c-name "gtk_combo_box_set_entry_text_column")
+ (return-type "none")
+ (parameters
+ '("gint" "text_column")
+ )
+)
+
+(define-method get_entry_text_column
+ (of-object "GtkComboBox")
+ (c-name "gtk_combo_box_get_entry_text_column")
+ (return-type "gint")
+)
+
(define-function gtk_combo_box_new_text
(c-name "gtk_combo_box_new_text")
(return-type "GtkWidget*")
@@ -6861,16 +6861,6 @@
)
)
-(define-method propagate_expose
- (of-object "GtkContainer")
- (c-name "gtk_container_propagate_expose")
- (return-type "none")
- (parameters
- '("GtkWidget*" "child")
- '("GdkEventExpose*" "event")
- )
-)
-
(define-method set_focus_chain
(of-object "GtkContainer")
(c-name "gtk_container_set_focus_chain")
@@ -18602,6 +18592,90 @@
+;; From gtkspreadtable.h
+
+(define-function gtk_spread_table_get_type
+ (c-name "gtk_spread_table_get_type")
+ (return-type "GType")
+)
+
+(define-function gtk_spread_table_new
+ (c-name "gtk_spread_table_new")
+ (is-constructor-of "GtkSpreadTable")
+ (return-type "GtkWidget*")
+ (parameters
+ '("GtkOrientation" "orientation")
+ '("guint" "lines")
+ )
+)
+
+(define-method insert_child
+ (of-object "GtkSpreadTable")
+ (c-name "gtk_spread_table_insert_child")
+ (return-type "none")
+ (parameters
+ '("GtkWidget*" "child")
+ '("gint" "index")
+ )
+)
+
+(define-method get_child_line
+ (of-object "GtkSpreadTable")
+ (c-name "gtk_spread_table_get_child_line")
+ (return-type "guint")
+ (parameters
+ '("GtkWidget*" "child")
+ '("gint" "size")
+ )
+)
+
+(define-method set_lines
+ (of-object "GtkSpreadTable")
+ (c-name "gtk_spread_table_set_lines")
+ (return-type "none")
+ (parameters
+ '("guint" "lines")
+ )
+)
+
+(define-method get_lines
+ (of-object "GtkSpreadTable")
+ (c-name "gtk_spread_table_get_lines")
+ (return-type "guint")
+)
+
+(define-method set_horizontal_spacing
+ (of-object "GtkSpreadTable")
+ (c-name "gtk_spread_table_set_horizontal_spacing")
+ (return-type "none")
+ (parameters
+ '("guint" "spacing")
+ )
+)
+
+(define-method get_horizontal_spacing
+ (of-object "GtkSpreadTable")
+ (c-name "gtk_spread_table_get_horizontal_spacing")
+ (return-type "guint")
+)
+
+(define-method set_vertical_spacing
+ (of-object "GtkSpreadTable")
+ (c-name "gtk_spread_table_set_vertical_spacing")
+ (return-type "none")
+ (parameters
+ '("guint" "spacing")
+ )
+)
+
+(define-method get_vertical_spacing
+ (of-object "GtkSpreadTable")
+ (c-name "gtk_spread_table_get_vertical_spacing")
+ (return-type "guint")
+)
+
+
+
;; From gtkstatusbar.h
(define-function gtk_statusbar_get_type
@@ -18662,21 +18736,6 @@
)
)
-(define-method set_has_resize_grip
- (of-object "GtkStatusbar")
- (c-name "gtk_statusbar_set_has_resize_grip")
- (return-type "none")
- (parameters
- '("gboolean" "setting")
- )
-)
-
-(define-method get_has_resize_grip
- (of-object "GtkStatusbar")
- (c-name "gtk_statusbar_get_has_resize_grip")
- (return-type "gboolean")
-)
-
(define-method get_message_area
(of-object "GtkStatusbar")
(c-name "gtk_statusbar_get_message_area")
@@ -26409,21 +26468,6 @@
(return-type "GType")
)
-(define-function gtk_wrap_allocation_mode_get_type
- (c-name "gtk_wrap_allocation_mode_get_type")
- (return-type "GType")
-)
-
-(define-function gtk_wrap_box_spreading_get_type
- (c-name "gtk_wrap_box_spreading_get_type")
- (return-type "GType")
-)
-
-(define-function gtk_wrap_box_packing_get_type
- (c-name "gtk_wrap_box_packing_get_type")
- (return-type "GType")
-)
-
(define-function gtk_file_chooser_action_get_type
(c-name "gtk_file_chooser_action_get_type")
(return-type "GType")
@@ -27821,6 +27865,15 @@
(return-type "GdkVisual*")
)
+(define-method set_visual
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_set_visual")
+ (return-type "none")
+ (parameters
+ '("GdkVisual*" "visual")
+ )
+)
+
(define-method get_screen
(of-object "GtkWidget")
(c-name "gtk_widget_get_screen")
@@ -27860,6 +27913,81 @@
)
)
+(define-method get_hexpand
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_get_hexpand")
+ (return-type "gboolean")
+)
+
+(define-method set_hexpand
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_set_hexpand")
+ (return-type "none")
+ (parameters
+ '("gboolean" "expand")
+ )
+)
+
+(define-method get_hexpand_set
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_get_hexpand_set")
+ (return-type "gboolean")
+)
+
+(define-method set_hexpand_set
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_set_hexpand_set")
+ (return-type "none")
+ (parameters
+ '("gboolean" "set")
+ )
+)
+
+(define-method get_vexpand
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_get_vexpand")
+ (return-type "gboolean")
+)
+
+(define-method set_vexpand
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_set_vexpand")
+ (return-type "none")
+ (parameters
+ '("gboolean" "expand")
+ )
+)
+
+(define-method get_vexpand_set
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_get_vexpand_set")
+ (return-type "gboolean")
+)
+
+(define-method set_vexpand_set
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_set_vexpand_set")
+ (return-type "none")
+ (parameters
+ '("gboolean" "set")
+ )
+)
+
+(define-method queue_compute_expand
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_queue_compute_expand")
+ (return-type "none")
+)
+
+(define-method compute_expand
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_compute_expand")
+ (return-type "gboolean")
+ (parameters
+ '("GtkOrientation" "orientation")
+ )
+)
+
(define-method get_support_multidevice
(of-object "GtkWidget")
(c-name "gtk_widget_get_support_multidevice")
@@ -28836,15 +28964,6 @@
(return-type "GdkScreen*")
)
-(define-method set_visual
- (of-object "GtkWindow")
- (c-name "gtk_window_set_visual")
- (return-type "none")
- (parameters
- '("GdkVisual*" "visual")
- )
-)
-
(define-method is_active
(of-object "GtkWindow")
(c-name "gtk_window_is_active")
@@ -29290,6 +29409,26 @@
)
)
+(define-method set_default_geometry
+ (of-object "GtkWindow")
+ (c-name "gtk_window_set_default_geometry")
+ (return-type "none")
+ (parameters
+ '("gint" "width")
+ '("gint" "height")
+ )
+)
+
+(define-method resize_to_geometry
+ (of-object "GtkWindow")
+ (c-name "gtk_window_resize_to_geometry")
+ (return-type "none")
+ (parameters
+ '("gint" "width")
+ '("gint" "height")
+ )
+)
+
(define-method get_group
(of-object "GtkWindow")
(c-name "gtk_window_get_group")
@@ -29358,6 +29497,36 @@
)
)
+(define-method set_has_resize_grip
+ (of-object "GtkWindow")
+ (c-name "gtk_window_set_has_resize_grip")
+ (return-type "none")
+ (parameters
+ '("gboolean" "value")
+ )
+)
+
+(define-method get_has_resize_grip
+ (of-object "GtkWindow")
+ (c-name "gtk_window_get_has_resize_grip")
+ (return-type "gboolean")
+)
+
+(define-method resize_grip_is_visible
+ (of-object "GtkWindow")
+ (c-name "gtk_window_resize_grip_is_visible")
+ (return-type "gboolean")
+)
+
+(define-method get_resize_grip_area
+ (of-object "GtkWindow")
+ (c-name "gtk_window_get_resize_grip_area")
+ (return-type "gboolean")
+ (parameters
+ '("GdkRectangle*" "rect")
+ )
+)
+
(define-method remove_embedded_xid
(of-object "GtkWindow")
(c-name "gtk_window_remove_embedded_xid")
diff --git a/gtk/src/statusbar.hg b/gtk/src/statusbar.hg
index abf9a42..d3cc761 100644
--- a/gtk/src/statusbar.hg
+++ b/gtk/src/statusbar.hg
@@ -60,7 +60,7 @@ public:
_WRAP_METHOD(void pop(guint context_id = 0), gtk_statusbar_pop)
- /** Forces the removal of a message from a statusbar's stack.
+ /** Forces the removal of a message from a statusbar's stack.
* The exact context_id and message_id must be specified.
* @param message_id A message identifier, as returned by push().
* @param context_id A context identifier.
@@ -70,9 +70,6 @@ public:
_WRAP_METHOD(void remove_all_messages(guint context_id = 0), gtk_statusbar_remove_all)
- _WRAP_METHOD(void set_has_resize_grip(bool setting = true), gtk_statusbar_set_has_resize_grip)
- _WRAP_METHOD(bool get_has_resize_grip() const, gtk_statusbar_get_has_resize_grip)
-
//This actually returns a GtkFrame, though the documentation describes it as "box".
//I'm not generally happy about API that returns an unknown type. murrayc.
_WRAP_METHOD(Gtk::Widget* get_message_area(), gtk_statusbar_get_message_area)
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index ed8ef70..63eb264 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -91,6 +91,8 @@ public:
_WRAP_PROPERTY("gravity", Gdk::Gravity)
_WRAP_PROPERTY("transient_for", Window*)
_WRAP_PROPERTY("opacity", double)
+ _WRAP_PROPERTY("has-resize-grip", bool)
+ _WRAP_PROPERTY("resize-grip-visible", bool)
_WRAP_PROPERTY("urgency_hint", bool)
_WRAP_PROPERTY("accept-focus", bool)
_WRAP_PROPERTY("focus-on-map", bool)
@@ -334,6 +336,11 @@ dnl
_WRAP_METHOD(void reshow_with_initial_size(),
gtk_window_reshow_with_initial_size)
+ _WRAP_METHOD(void set_has_resize_grip(bool setting = true), gtk_window_set_has_resize_grip)
+ _WRAP_METHOD(bool get_has_resize_grip() const, gtk_window_get_has_resize_grip)
+
+ _WRAP_METHOD(bool get_resize_grip_is_visible() const, gtk_window_resize_grip_is_visible)
+ _WRAP_METHOD(bool get_resize_grip_area(Gdk::Rectangle& rect) const, gtk_window_get_resize_grip_area)
_WRAP_METHOD(void set_keep_above(bool setting = true), gtk_window_set_keep_above)
_WRAP_METHOD(void set_keep_below(bool setting = true), gtk_window_set_keep_below)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]