Add missing accessors for notebook details

The ms-windows theme engine needs to access the tab-{h,v}border,
so add accessors. Bug 625655.

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 3780a5be3d6df954d6d8d9cde639e7c134efb07e..235dca23eeb42b20555e64235571c93c68516127 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -2236,6 +2236,8 @@ gtk_notebook_get_tab_label_text
 gtk_notebook_get_tab_pos
 gtk_notebook_get_tab_reorderable
 gtk_notebook_get_tab_detachable
+gtk_notebook_get_tab_hborder
+gtk_notebook_get_tab_vborder
 gtk_notebook_set_current_page
 gtk_notebook_set_group
 gtk_notebook_get_group

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 53782179009dbcba0a212a5bda313a7c185caff4..b9180d45bf326a4621d0e7c27348f8a3470dfa5e 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2175,6 +2175,8 @@ gtk_notebook_set_show_tabs
 gtk_notebook_set_tab_label
 gtk_notebook_set_tab_label_text
 gtk_notebook_set_tab_pos
+gtk_notebook_get_tab_hborder
+gtk_notebook_get_tab_vborder
 gtk_notebook_set_window_creation_hook
 gtk_notebook_get_group
 gtk_notebook_set_group

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index b911c73d67fa1cc1edcec17dc453cef58760ff2f..8fce95555bc9d02037504a251821f3cd15abbdb8 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -6770,13 +6770,15 @@ gtk_notebook_prev_page (GtkNotebook *notebook)
 /* Public GtkNotebook/Tab Style Functions
  *
  * gtk_notebook_set_show_border
+ * gtk_notebook_get_show_border
  * gtk_notebook_set_show_tabs
+ * gtk_notebook_get_show_tabs
  * gtk_notebook_set_tab_pos
- * gtk_notebook_set_homogeneous_tabs
- * gtk_notebook_set_tab_border
- * gtk_notebook_set_tab_hborder
- * gtk_notebook_set_tab_vborder
+ * gtk_notebook_get_tab_pos
  * gtk_notebook_set_scrollable
+ * gtk_notebook_get_scrollable
+ * gtk_notebook_get_tab_hborder
+ * gtk_notebook_get_tab_vborder
  */
 /**
  * gtk_notebook_set_show_border:
@@ -6997,6 +6999,43 @@ gtk_notebook_get_scrollable (GtkNotebook *notebook)
   return notebook->priv->scrollable;
 }
 
+/**
+ * gtk_notebook_get_tab_hborder:
+ * @notebook: a #GtkNotebook
+ *
+ * Returns the horizontal width of a tab border.
+ *
+ * Return value: horizontal width of a tab border
+ *
+ * Since: 2.22
+ */
+guint16
+gtk_notebook_get_tab_hborder (GtkNotebook *notebook)
+{
+  g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
+
+  return notebook->priv->tab_hborder;
+}
+
+/**
+ * gtk_notebook_get_tab_vborder:
+ * @notebook: a #GtkNotebook
+ *
+ * Returns the vertical width of a tab border.
+ *
+ * Return value: vertical width of a tab border
+ *
+ * Since: 2.22
+ */
+guint16
+gtk_notebook_get_tab_vborder (GtkNotebook *notebook)
+{
+  g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
+
+  return notebook->priv->tab_vborder;
+}
+
+
 /* Public GtkNotebook Popup Menu Methods:
  *
  * gtk_notebook_popup_enable

diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index a61b655b7923d41ed2f6be46e91f765983bcf3e9..9ced43b03361eeae7f664ec92e3207c0513c2b23 100644 (file)
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -182,6 +182,8 @@ GtkPositionType gtk_notebook_get_tab_pos   (GtkNotebook     *notebook);
 void     gtk_notebook_set_scrollable       (GtkNotebook     *notebook,
                                            gboolean         scrollable);
 gboolean gtk_notebook_get_scrollable       (GtkNotebook     *notebook);
+guint16  gtk_notebook_get_tab_hborder      (GtkNotebook     *notebook);
+guint16  gtk_notebook_get_tab_vborder      (GtkNotebook     *notebook);
 
 /***********************************************************
  *               enable/disable PopupMenu                  *

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 6a2c3ce4ea8c8a1ec5240d930edea3d439b1582d..aaa8cb9a8dc6962d3367252f24bcf7cc94b2cf08 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -2817,29 +2817,29 @@ draw_box_gap (GtkStyle *style, GdkWindow *window, GtkStateType state_type,
       if (side == GTK_POS_TOP)
        {
          x2 = x;
-         y2 = y - notebook->tab_vborder;
+         y2 = y - gtk_notebook_get_tab_vborder (notebook);
          w2 = width;
-         h2 = height + notebook->tab_vborder * 2;
+         h2 = height + gtk_notebook_get_tab_vborder (notebook) * 2;
        }
       else if (side == GTK_POS_BOTTOM)
        {
          x2 = x;
          y2 = y;
          w2 = width;
-         h2 = height + notebook->tab_vborder * 2;
+         h2 = height + gtk_notebook_get_tab_vborder (notebook) * 2;
        }
       else if (side == GTK_POS_LEFT)
        {
-         x2 = x - notebook->tab_hborder;
+         x2 = x - gtk_notebook_get_tab_hborder (notebook);
          y2 = y;
-         w2 = width + notebook->tab_hborder;
+         w2 = width + gtk_notebook_get_tab_hborder (notebook);
          h2 = height;
        }
       else if (side == GTK_POS_RIGHT)
        {
          x2 = x;
          y2 = y;
-         w2 = width + notebook->tab_hborder * 2;
+         w2 = width + gtk_notebook_get_tab_hborder (notebook) * 2;
          h2 = height;
        }