diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-12 09:53:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-12 09:54:02 +0100 |
| commit | cc5baa41fee257498661320e24169bb3f05391fb (patch) | |
| tree | a41d0ad05d072ab1a3d3eb2bd9257fcf92a1f6ac | |
| parent | 7a66dbe982623be620ad6ac426fe689a434e5f51 (diff) | |
fix build
Change-Id: I2afc99ec7b54f366044835a8d8e1ceeb1783ca2c
| -rw-r--r-- | include/vcl/tabctrl.hxx | 9 | ||||
| -rw-r--r-- | svtools/source/toolpanel/paneltabbar.cxx | 11 | ||||
| -rw-r--r-- | vcl/source/control/tabctrl.cxx | 9 |
3 files changed, 18 insertions, 11 deletions
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index b9defc9f7260..4a6a53041442 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -34,6 +34,15 @@ class ListBox; #define TAB_PAGE_NOTFOUND ((sal_uInt16)0xFFFF) #endif /* !TAB_APPEND */ +#define TAB_OFFSET 3 +#define TAB_TABOFFSET_X 3 +#define TAB_TABOFFSET_Y 3 +#define TAB_EXTRASPACE_X 6 +#define TAB_BORDER_LEFT 1 +#define TAB_BORDER_TOP 1 +#define TAB_BORDER_RIGHT 2 +#define TAB_BORDER_BOTTOM 2 + class VCL_DLLPUBLIC TabControl : public Control { private: diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 4c12b9fc92f2..b1f28b5ed2a4 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -296,7 +296,10 @@ namespace svt { const ControlState nState( lcl_ItemToControlState( i_nItemFlags ) ); - TabitemValue tiValue; + TabitemValue tiValue(Rectangle(i_rContentArea.Left() + TAB_TABOFFSET_X, + i_rContentArea.Right() - TAB_TABOFFSET_X, + i_rContentArea.Top() + TAB_TABOFFSET_Y, + i_rContentArea.Bottom() - TAB_TABOFFSET_Y)); Rectangle aBoundingRegion, aContentRegion; bool bNativeOK = getTargetDevice().GetNativeControlRegion( @@ -316,7 +319,11 @@ namespace svt { const ControlState nState = lcl_ItemToControlState( i_nItemFlags ); - TabitemValue tiValue; + TabitemValue tiValue(Rectangle(i_rContentRect.Left() + TAB_TABOFFSET_X, + i_rContentRect.Right() - TAB_TABOFFSET_X, + i_rContentRect.Top() + TAB_TABOFFSET_Y, + i_rContentRect.Bottom() - TAB_TABOFFSET_Y)); + if ( i_nItemFlags & ITEM_POSITION_FIRST ) tiValue.mnAlignment |= TABITEM_FIRST_IN_GROUP; if ( i_nItemFlags & ITEM_POSITION_LAST ) diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 7a0e2a644dbf..e121896f2d16 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -70,15 +70,6 @@ struct ImplTabCtrlData VclPtr<ListBox> mpListBox; }; -#define TAB_OFFSET 3 -#define TAB_TABOFFSET_X 3 -#define TAB_TABOFFSET_Y 3 -#define TAB_EXTRASPACE_X 6 -#define TAB_BORDER_LEFT 1 -#define TAB_BORDER_TOP 1 -#define TAB_BORDER_RIGHT 2 -#define TAB_BORDER_BOTTOM 2 - // for the Tab positions #define TAB_PAGERECT 0xFFFF |