diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-14 15:45:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-17 15:02:47 +0100 |
| commit | 4fce8bd59eae6d2ed6e5a3f9a3d4898fcd3431a9 (patch) | |
| tree | 9c39227239f1a62a67eca6b63d91913a20f9d9b9 /vcl | |
| parent | dd04278bfc3c89336283fcab1222147dcd796a77 (diff) | |
use released 3.20.0 instead of 3.19.2
Change-Id: Iac311e0c326cf79a2dbacb889d39ab49ccaa9325
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index d86860b2b64d..0ddab74db79e 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2070,8 +2070,8 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) if (!m_pWindow) return; -#if GTK_CHECK_VERSION(3, 19, 2) - if (gtk_check_version(3, 19, 2) == nullptr) +#if GTK_CHECK_VERSION(3, 20, 0) + if (gtk_check_version(3, 20, 0) == nullptr) { GdkSeat* pSeat = gdk_display_get_default_seat(getGdkDisplay()); if (bGrab) diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index 04561e72ebe1..0a3b2b665cea 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -714,7 +714,7 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType, gtk_style_context_get_padding( mpButtonStyle, gtk_style_context_get_state(mpButtonStyle), &padding); gint nArrowWidth = FALLBACK_ARROW_SIZE; - if (gtk_check_version(3, 19, 2) == nullptr) + if (gtk_check_version(3, 20, 0) == nullptr) { gtk_style_context_get(mpComboboxButtonArrowStyle, gtk_style_context_get_state(mpComboboxButtonArrowStyle), @@ -775,7 +775,7 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr, aEditBoxRect.SetPos( Point( areaRect.Left() + buttonRect.GetWidth(), areaRect.Top() ) ); gint arrow_width = FALLBACK_ARROW_SIZE, arrow_height = FALLBACK_ARROW_SIZE; - if (gtk_check_version(3, 19, 2) == nullptr) + if (gtk_check_version(3, 20, 0) == nullptr) { if (nType == ControlType::Combobox) { @@ -1311,7 +1311,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co renderType = RenderType::BackgroundAndFrame; break; case ControlPart::MenuItemCheckMark: - if (gtk_check_version(3, 19, 2) == nullptr) + if (gtk_check_version(3, 20, 0) == nullptr) context = mpCheckMenuItemStyle; else { @@ -1326,7 +1326,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co } break; case ControlPart::MenuItemRadioMark: - if (gtk_check_version(3, 19, 2) == nullptr) + if (gtk_check_version(3, 20, 0) == nullptr) context = mpRadioMenuItemStyle; else { @@ -1346,7 +1346,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co renderType = RenderType::MenuSeparator; break; case ControlPart::SubmenuArrow: - if (gtk_check_version(3, 19, 2) == nullptr) + if (gtk_check_version(3, 20, 0) == nullptr) context = mpMenuItemArrowStyle; else { @@ -1506,7 +1506,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co if (nType == ControlType::TabItem) { GtkBorder margin; - if (gtk_check_version(3, 19, 2) == nullptr) + if (gtk_check_version(3, 20, 0) == nullptr) { gtk_style_context_get_margin(mpNotebookHeaderTabsTabStyle, gtk_style_context_get_state(mpNotebookHeaderTabsTabStyle), &margin); @@ -2095,7 +2095,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetVisitedLinkColor(getColor(text_color)); #endif - if (gtk_check_version(3, 19, 2) == nullptr) + if (gtk_check_version(3, 20, 0) == nullptr) { GtkStyleContext *pCStyle = mpNotebookHeaderTabsTabStyle; |