[pan2] simplified body-pane fix
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] simplified body-pane fix
- Date: Wed, 11 Jan 2012 07:15:00 +0000 (UTC)
commit 9b2896665be5d0e6f0ad1a4177c98b3681351a0f
Author: Heinrich MÃller <henmull src gnome org>
Date: Wed Jan 11 08:14:37 2012 +0100
simplified body-pane fix
pan/gui/body-pane.cc | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 2cdc1cb..9a7896c 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -1634,16 +1634,9 @@ BodyPane :: add_attachment_to_toolbar (const char* fn)
++_attachments;
#if !GTK_CHECK_VERSION(3,0,0)
- guint cols(0), rows(0);
-#if GTK_CHECK_VERSION(2,22,0)
- gtk_table_get_size (GTK_TABLE(_att_toolbar), &rows, &cols);
-#else
- TablePrivate *priv = (TablePrivate*)g_object_get_data(G_OBJECT(_att_toolbar),"priv");
- if (rows)
- rows = priv->nrows;
- if (cols)
- cols = priv->ncols;
-#endif // 2.22.0
+ guint cols(4), rows(0);
+ rows = _cur_row;
+
if (_attachments % 4 == 0 && _attachments != 0)
{
gtk_table_resize (GTK_TABLE(_att_toolbar), rows+1, cols);
@@ -1653,7 +1646,6 @@ BodyPane :: add_attachment_to_toolbar (const char* fn)
gtk_table_attach_defaults (GTK_TABLE(_att_toolbar), w, _cur_col, _cur_col+1, _cur_row,_cur_row+1);
-
++_cur_col;
#else
@@ -1667,12 +1659,6 @@ BodyPane :: add_attachment_to_toolbar (const char* fn)
gtk_grid_attach (GTK_GRID(_att_toolbar), w, _cur_col++, _cur_row, 1, 1);
#endif // 3.0.0
-#if !GTK_CHECK_VERSION(2,22,0)
- priv->nrows = _cur_row;
- priv->ncols = cols;
- g_object_set_data(G_OBJECT(_att_toolbar),"priv",priv);
-#endif
-
gtk_widget_show_all(_att_toolbar);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]