summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-01-13 17:15:46 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-01-15 00:36:41 +0000
commit0ac5eb5f14cc1bdb410846fba36aef8ab858a862 (patch)
tree66bc9571819ee6c56508d78012bde4f1b6dec72a /vcl
parented68d602f598e147f3e8f4cc54cc7b3882733f4f (diff)
vcl: isolate new attempt to count monitors as screens to gtk3 fdo#43458
It turns out this new idea of mapping xinerama screens, and xrandr monitors into a flat integer space is nice, but when we confuse xrandr monitor 2 (idx 1) with X screen 1 (there is only one screen) we bit the dust. Many thanks to Cor Nouws for remote debugging assistance
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx2
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 4f0d71ca65bc..2b5627ca5349 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -154,10 +154,12 @@ public:
GdkCursor *getCursor( PointerStyle ePointerStyle );
virtual int CaptureMouse( SalFrame* pFrame );
+#if GTK_CHECK_VERSION(3,0,0)
bool IsXinerama() { return !m_pSys->IsMultiDisplay(); }
int GetDefaultScreenNumber() { return m_pSys->GetDefaultDisplayNumber(); }
int GetScreenCount() { return m_pSys->GetDisplayScreenCount(); }
Size GetScreenSize( int screen );
+#endif
virtual void initScreen( int nScreen ) const;
GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event,
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 06d29d5f54c2..f778354ed5c9 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -4160,10 +4160,12 @@ gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint
return sal_False;
}
+#if GTK_CHECK_VERSION(3,0,0)
Size GtkSalDisplay::GetScreenSize( int nScreen )
{
Rectangle aRect = m_pSys->GetDisplayScreenPosSizePixel( nScreen );
return Size( aRect.GetWidth(), aRect.GetHeight() );
}
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */