diff options
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/salsys.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtksys.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/unx/x11/x11sys.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/svapp.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/win/salsys.h | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx index 001a8a948028..6c9eb37ae011 100644 --- a/vcl/inc/salsys.hxx +++ b/vcl/inc/salsys.hxx @@ -86,7 +86,7 @@ public: @returns the default screen number */ - virtual unsigned int GetDisplayDefaultScreen() { return 0; } + virtual unsigned int GetDisplayBuiltInScreen() { return 0; } /* Gets relative position and size of the screens attached to the display @param nScreen diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 033bf1a14f4c..f2663f486c6b 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -157,7 +157,7 @@ public: GdkCursor *getCursor( PointerStyle ePointerStyle ); virtual int CaptureMouse( SalFrame* pFrame ); - int GetDefaultScreen() { return m_pSys->GetDisplayDefaultScreen(); } + int GetDefaultScreen() { return m_pSys->GetDisplayBuiltInScreen(); } SalX11Screen GetDefaultXScreen() { return m_pSys->GetDisplayDefaultXScreen(); } Size GetScreenSize( int nDisplayScreen ); int GetXScreenCount() { return m_pSys->GetDisplayXScreenCount(); } diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx index 94fe25a8d54a..3bd7988b07e7 100644 --- a/vcl/inc/unx/gtk/gtksys.hxx +++ b/vcl/inc/unx/gtk/gtksys.hxx @@ -49,7 +49,7 @@ public: virtual bool IsUnifiedDisplay(); virtual unsigned int GetDisplayScreenCount(); - virtual unsigned int GetDisplayDefaultScreen(); + virtual unsigned int GetDisplayBuiltInScreen(); virtual rtl::OUString GetDisplayScreenName (unsigned int nScreen); virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScreen); @@ -58,7 +58,7 @@ public: const std::list< rtl::OUString >& rButtons, int nDefButton); SalX11Screen GetDisplayDefaultXScreen() - { return getXScreenFromDisplayScreen( GetDisplayDefaultScreen() ); } + { return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); } int GetDisplayXScreenCount(); SalX11Screen getXScreenFromDisplayScreen(unsigned int nDisplayScreen); void countScreenMonitors(); diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx index 8a36d3ef9be3..80b5d58a5592 100644 --- a/vcl/inc/unx/x11/x11sys.hxx +++ b/vcl/inc/unx/x11/x11sys.hxx @@ -45,7 +45,7 @@ public: // overload pure virtual methods virtual unsigned int GetDisplayScreenCount(); virtual bool IsUnifiedDisplay(); - virtual unsigned int GetDisplayDefaultScreen(); + virtual unsigned int GetDisplayBuiltInScreen(); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index 7b793c206596..af766f4a9762 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -300,7 +300,11 @@ public: // will always be GetDisplayDefaultScreen() SAL_DLLPRIVATE static unsigned int GetBestScreen( const Rectangle& ); SAL_DLLPRIVATE static Rectangle GetWorkAreaPosSizePixel( unsigned int nScreen ); - SAL_DLLPRIVATE static unsigned int GetDisplayDefaultScreen(); + // This returns the LCD screen number for a laptop, or the primary + // external VGA display for a desktop machine - it is where a presenter + // console should be rendered if there are other (non-built-in) screens + // present. + SAL_DLLPRIVATE static unsigned int GetDisplayBuiltInScreen(); SAL_DLLPRIVATE static rtl::OUString GetDisplayScreenName( unsigned int nScreen ); static const LocaleDataWrapper& GetAppLocaleDataWrapper(); diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h index 7bd092cd7624..b15c1a773600 100644 --- a/vcl/inc/win/salsys.h +++ b/vcl/inc/win/salsys.h @@ -69,7 +69,7 @@ public: virtual ~WinSalSystem(); virtual unsigned int GetDisplayScreenCount(); - virtual unsigned int GetDisplayDefaultScreen(); + virtual unsigned int GetDisplayBuiltInScreen(); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); |