diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2014-12-07 21:33:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-09 09:12:07 +0000 |
| commit | fe95c62b39dae4cb907addfba5c73bb847f1301d (patch) | |
| tree | fa16928e95a1d036036fc69192630297485cbc90 /vcl | |
| parent | 127b0926b5ceff0dcb44e7b7ac4ecbc479f44d97 (diff) | |
Bump minimum gtk version to 2.10
That is the version available in RHEL 5. The configure change for
telepathy has been changed for consistency only.
Change-Id: I664901dd2bbcc75f6f6fb84940f3fa85d69f57dd
Reviewed-on: https://gerrit.libreoffice.org/13369
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 12 | ||||
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 7 |
3 files changed, 0 insertions, 29 deletions
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index c2f56aae9714..2165a1ed2e27 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -244,22 +244,10 @@ void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUStri sGtkURL = OString(g_uri); g_free(g_uri); } -#if GTK_CHECK_VERSION(2,10,0) GtkRecentManager *manager = gtk_recent_manager_get_default (); gtk_recent_manager_add_item (manager, sGtkURL.getStr()); (void)rMimeType; (void)rDocumentService; -#else - static getDefaultFnc sym_gtk_recent_manager_get_default = - (getDefaultFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_get_default" ); - - static addItemFnc sym_gtk_recent_manager_add_item = - (addItemFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_add_item"); - if (sym_gtk_recent_manager_get_default && sym_gtk_recent_manager_add_item) - sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(), sGtkURL.getStr()); - else - X11SalInstance::AddToRecentDocumentList(rFileUrl, rMimeType, rDocumentService); -#endif } SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 3fad10ee150d..598005d9d567 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -4206,18 +4206,8 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); -#if !GTK_CHECK_VERSION(2,9,0) - static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) = - (cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gdk_screen_get_font_options" ); - if( gdk_screen_get_font_options != NULL ) - { - const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen ); - aStyleSet.SetCairoFontOptions( pNewOptions ); - } -#else const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen ); aStyleSet.SetCairoFontOptions( pNewOptions ); -#endif // finally update the collected settings rSettings.SetStyleSettings( aStyleSet ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 6f3688321278..f1065be1eaa3 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -97,13 +97,6 @@ #include <config_folders.h> -// make compile on gtk older than 2.10 -#if GTK_MINOR_VERSION < 10 -#define GDK_SUPER_MASK (1 << 26) -#define GDK_HYPER_MASK (1 << 27) -#define GDK_META_MASK (1 << 28) -#endif - #if GTK_CHECK_VERSION(3,0,0) #define IS_WIDGET_REALIZED gtk_widget_get_realized #define IS_WIDGET_MAPPED gtk_widget_get_mapped |