Add missing getters for readwrite properies. (#135649)

Thu May  6 00:02:21 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombobox.c (gtk_combo_box_get_wrap_width):
	(gtk_combo_box_get_row_span_column):
	(gtk_combo_box_get_column_span_column): Add missing getters
	for readwrite properies. (#135649)

diff --git a/ChangeLog b/ChangeLog
index 0133b14e3547ca0dff06fa90cc912948cbe96feb..15ea51f1b84df8a9ae4fb89b2aefb64da8cf4463 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu May  6 00:02:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_get_wrap_width): 
+       (gtk_combo_box_get_row_span_column): 
+       (gtk_combo_box_get_column_span_column): Add missing getters
+       for readwrite properies. (#135649)
+
 Wed May  5 23:42:42 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0133b14e3547ca0dff06fa90cc912948cbe96feb..15ea51f1b84df8a9ae4fb89b2aefb64da8cf4463 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu May  6 00:02:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_get_wrap_width): 
+       (gtk_combo_box_get_row_span_column): 
+       (gtk_combo_box_get_column_span_column): Add missing getters
+       for readwrite properies. (#135649)
+
 Wed May  5 23:42:42 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0133b14e3547ca0dff06fa90cc912948cbe96feb..15ea51f1b84df8a9ae4fb89b2aefb64da8cf4463 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu May  6 00:02:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_get_wrap_width): 
+       (gtk_combo_box_get_row_span_column): 
+       (gtk_combo_box_get_column_span_column): Add missing getters
+       for readwrite properies. (#135649)
+
 Wed May  5 23:42:42 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0133b14e3547ca0dff06fa90cc912948cbe96feb..15ea51f1b84df8a9ae4fb89b2aefb64da8cf4463 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu May  6 00:02:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_get_wrap_width): 
+       (gtk_combo_box_get_row_span_column): 
+       (gtk_combo_box_get_column_span_column): Add missing getters
+       for readwrite properies. (#135649)
+
 Wed May  5 23:42:42 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.h: 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 0c1bf683f2b9b846a83b5640247d4ab879c804da..abfc3d5629d5495cd36b53b14ec1d9bd48dcd087 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+Thu May  6 00:04:03 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtk-sections.txt: Add missing getters.
+
 Wed May  5 23:46:19 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtk-sections.txt: Add gtk_combo_box_get_active_text().

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 12bee55c71d606567a7441ec152e40e8f6dd28d3..1c02125f3649e5b1f8e82f0b441be25b80f70127 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -671,8 +671,11 @@ gtk_combo_get_type
 GtkComboBox
 gtk_combo_box_new
 gtk_combo_box_new_with_model
+gtk_combo_box_get_wrap_width
 gtk_combo_box_set_wrap_width
+gtk_combo_box_get_row_span_column
 gtk_combo_box_set_row_span_column
+gtk_combo_box_get_column_span_column
 gtk_combo_box_set_column_span_column
 gtk_combo_box_get_active
 gtk_combo_box_set_active

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index e76a7218aad656fb6387af5b8f0880a8d9f287a2..b4e3ba9e5eaddc32f0044f290dda6bf0a25aeeb0 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3023,6 +3023,26 @@ gtk_combo_box_new_with_model (GtkTreeModel *model)
   return GTK_WIDGET (combo_box);
 }
 
+/**
+ * gtk_combo_box_get_wrap_width:
+ * @combo_box: A #GtkComboBox.
+ *
+ * Returns the wrap width which is used to determine the number
+ * of columns for the popup menu. If the wrap width is larger than
+ * 1, the combo box is in table mode.
+ *
+ * Returns: the wrap width.
+ *
+ * Since: 2.6
+ */
+gint
+gtk_combo_box_get_wrap_width (GtkComboBox *combo_box)
+{
+  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), -1);
+
+  return combo_box->priv->wrap_width;
+}
+
 /**
  * gtk_combo_box_set_wrap_width:
  * @combo_box: A #GtkComboBox.
@@ -3052,6 +3072,24 @@ gtk_combo_box_set_wrap_width (GtkComboBox *combo_box,
     }
 }
 
+/**
+ * gtk_combo_box_get_row_span_column:
+ * @combo_box: A #GtkComboBox.
+ *
+ * Returns the column with row span information for @combo_box.
+ *
+ * Returns: the row span column.
+ *
+ * Since: 2.6
+ */
+gint
+gtk_combo_box_get_row_span_column (GtkComboBox *combo_box)
+{
+  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), -1);
+
+  return combo_box->priv->row_column;
+}
+
 /**
  * gtk_combo_box_set_row_span_column:
  * @combo_box: A #GtkComboBox.
@@ -3084,6 +3122,24 @@ gtk_combo_box_set_row_span_column (GtkComboBox *combo_box,
     }
 }
 
+/**
+ * gtk_combo_box_get_column_span_column:
+ * @combo_box: A #GtkComboBox.
+ *
+ * Returns the column with column span information for @combo_box.
+ *
+ * Returns: the column span column.
+ *
+ * Since: 2.6
+ */
+gint
+gtk_combo_box_get_column_span_column (GtkComboBox *combo_box)
+{
+  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), -1);
+
+  return combo_box->priv->col_column;
+}
+
 /**
  * gtk_combo_box_set_column_span_column:
  * @combo_box: A #GtkComboBox.

diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index c444bbec0af751b91923ba36b7c486e00cfb1115..a0b2a5df9997014cb07c7c5325279983200b29e9 100644 (file)
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -66,10 +66,13 @@ GtkWidget    *gtk_combo_box_new              (void);
 GtkWidget    *gtk_combo_box_new_with_model   (GtkTreeModel    *model);
 
 /* grids */
+gint          gtk_combo_box_get_wrap_width         (GtkComboBox *combo_box);
 void          gtk_combo_box_set_wrap_width         (GtkComboBox *combo_box,
                                                     gint         width);
+gint          gtk_combo_box_get_row_span_column    (GtkComboBox *combo_box);
 void          gtk_combo_box_set_row_span_column    (GtkComboBox *combo_box,
                                                     gint         row_span);
+gint          gtk_combo_box_get_column_span_column (GtkComboBox *combo_box);
 void          gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
                                                     gint         column_span);