diff options
Diffstat (limited to 'vcl/unx/gtk/app/gtkdata.cxx')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index fdca512960a1..8ccb6a08b34f 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -217,12 +217,11 @@ void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen ) { gint nMonitors = gdk_screen_get_n_monitors(pScreen); m_aXineramaScreens = std::vector<Rectangle>(); - m_aXineramaScreenIndexMap = std::vector<int>(nMonitors); for (gint i = 0; i < nMonitors; ++i) { GdkRectangle dest; gdk_screen_get_monitor_geometry(pScreen, i, &dest); - addXineramaScreenUnique( i, dest.x, dest.y, dest.width, dest.height ); + addXineramaScreenUnique( dest.x, dest.y, dest.width, dest.height ); } m_bXinerama = m_aXineramaScreens.size() > 1; if( ! m_aFrames.empty() ) @@ -236,32 +235,6 @@ void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen ) } } -extern "C" -{ - typedef gint(* screen_get_primary_monitor)(GdkScreen *screen); -} - -int GtkSalDisplay::GetDefaultMonitorNumber() const -{ - GdkScreen* pScreen = gdk_display_get_screen( m_pGdkDisplay, m_nDefaultScreen ); -#if GTK_CHECK_VERSION(2,20,0) - return m_aXineramaScreenIndexMap[gdk_screen_get_primary_monitor(pScreen)]; -#else - static screen_get_primary_monitor sym_gdk_screen_get_primary_monitor = - (screen_get_primary_monitor)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gdk_screen_get_primary_monitor" ); - if (sym_gdk_screen_get_primary_monitor) - return sym_gdk_screen_get_primary_monitor( pScreen ); - //gdk_screen_get_primary_monitor unavailable, take the first laptop monitor as the default - gint nMonitors = gdk_screen_get_n_monitors(pScreen); - for (gint i = 0; i < nMonitors; ++i) - { - if (g_ascii_strncasecmp (gdk_screen_get_monitor_plug_name(pScreen, i), "LVDS", 4) == 0) - return m_aXineramaScreenIndexMap[i]; - } - return 0; -#endif -} - void GtkSalDisplay::initScreen( int nScreen ) const { if( nScreen < 0 || nScreen >= static_cast<int>(m_aScreens.size()) ) |