summaryrefslogtreecommitdiff
path: root/vcl/inc/unx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-01-14 10:31:40 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-01-15 00:36:41 +0000
commitca93d98343a03026c7568abc2ddda838f10fcbde (patch)
tree14ff4373b6921261e1d70f35cc286cf24c68039d /vcl/inc/unx
parente9202ffeccdf6f669184f3f869d2e5b121bea9f3 (diff)
vcl: rename ambiguous IsMultiDisplay to IsUnifiedDisplay, and simplify
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx1
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx2
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx2
3 files changed, 2 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 2b5627ca5349..cbd1341f7896 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -155,7 +155,6 @@ public:
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 );
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index c310e1729fad..4836f8b41ee1 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -41,7 +41,7 @@ public:
virtual ~GtkSalSystem();
static GtkSalSystem *GetSingleton();
- virtual bool IsMultiDisplay();
+ virtual bool IsUnifiedDisplay();
virtual unsigned int GetDisplayScreenCount();
virtual unsigned int GetDefaultDisplayNumber();
virtual rtl::OUString GetScreenName (unsigned int nScreen);
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 403625f20aa7..d030d8432f5d 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -44,7 +44,7 @@ public:
// overload pure virtual methods
virtual unsigned int GetDisplayScreenCount();
- virtual bool IsMultiDisplay();
+ virtual bool IsUnifiedDisplay();
virtual unsigned int GetDefaultDisplayNumber();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );