summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/aqua/salsys.h4
-rw-r--r--vcl/inc/headless/svpdummies.hxx4
-rw-r--r--vcl/inc/ios/salsys.h4
-rw-r--r--vcl/inc/salsys.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx6
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx8
-rw-r--r--vcl/inc/vcl/svapp.hxx6
-rw-r--r--vcl/inc/vcl/syswin.hxx8
-rw-r--r--vcl/inc/win/salsys.h6
10 files changed, 27 insertions, 29 deletions
diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/aqua/salsys.h
index bc09765cb0d3..6491cab50048 100644
--- a/vcl/inc/aqua/salsys.h
+++ b/vcl/inc/aqua/salsys.h
@@ -46,9 +46,9 @@ public:
// get info about the display
virtual unsigned int GetDisplayScreenCount();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
int nButtonCombination,
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 045214ec65cd..e1fb22c36341 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -82,8 +82,8 @@ class SvpSalSystem : public SalSystem
// get info about the display
virtual unsigned int GetDisplayScreenCount();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
diff --git a/vcl/inc/ios/salsys.h b/vcl/inc/ios/salsys.h
index 81522e82da2d..48ccfabc47bf 100644
--- a/vcl/inc/ios/salsys.h
+++ b/vcl/inc/ios/salsys.h
@@ -40,9 +40,9 @@ public:
// get info about the display
virtual unsigned int GetDisplayScreenCount();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const String& rTitle,
const String& rMessage,
int nButtonCombination,
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 24af20a118d7..ea952340c8c2 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -57,11 +57,9 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES = 6;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO = 7;
-
// -------------
// - SalSystem -
// -------------
-
class VCL_PLUGIN_PUBLIC SalSystem
{
public:
@@ -88,7 +86,7 @@ public:
@returns the default screen number
*/
- virtual unsigned int GetDefaultDisplayNumber() { return 0; }
+ virtual unsigned int GetDisplayDefaultScreen() { return 0; }
/* Gets relative position and size of the screens attached to the display
@param nScreen
@@ -106,7 +104,7 @@ public:
@returns position and size relative to the scree
*/
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen ) = 0;
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ) = 0;
/* Gets the name of a screen
@param nScreen
@@ -114,7 +112,7 @@ public:
@returns the name of the screen
*/
- virtual rtl::OUString GetScreenName( unsigned int nScreen ) = 0;
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ) = 0;
/* Shows a native message box with the specified title, message and button
combination.
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index cbd1341f7896..ced4d165433f 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -155,7 +155,7 @@ public:
virtual int CaptureMouse( SalFrame* pFrame );
#if GTK_CHECK_VERSION(3,0,0)
- int GetDefaultScreenNumber() { return m_pSys->GetDefaultDisplayNumber(); }
+ int GetDefaultScreenNumber() { return m_pSys->GetDisplayDefaultScreen(); }
int GetScreenCount() { return m_pSys->GetDisplayScreenCount(); }
Size GetScreenSize( int screen );
#endif
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 4836f8b41ee1..784623b901fd 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -43,10 +43,10 @@ public:
virtual bool IsUnifiedDisplay();
virtual unsigned int GetDisplayScreenCount();
- virtual unsigned int GetDefaultDisplayNumber();
- virtual rtl::OUString GetScreenName (unsigned int nScreen);
+ virtual unsigned int GetDisplayDefaultScreen();
+ virtual rtl::OUString GetDisplayScreenName (unsigned int nScreen);
virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen);
- virtual Rectangle GetDisplayWorkAreaPosSizePixel (unsigned int nScreen);
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScreen);
virtual int ShowNativeDialog (const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
const std::list< rtl::OUString >& rButtons,
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index d030d8432f5d..8a36d3ef9be3 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -45,10 +45,10 @@ public:
// overload pure virtual methods
virtual unsigned int GetDisplayScreenCount();
virtual bool IsUnifiedDisplay();
- virtual unsigned int GetDefaultDisplayNumber();
- virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual unsigned int GetDisplayDefaultScreen();
+ virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeDialog( const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
const std::list< rtl::OUString >& rButtons,
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 3bdfd900efb4..ba33ee2109ee 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -292,11 +292,11 @@ public:
// if IsUnifiedDisplay() == true the return value will be
// nearest screen of the target rectangle
// in case of IsUnifiedDisplay() == false the return value
- // will always be GetDefaultDisplayNumber()
+ // 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 GetDefaultDisplayNumber();
- SAL_DLLPRIVATE static rtl::OUString GetScreenName( unsigned int nScreen );
+ SAL_DLLPRIVATE static unsigned int GetDisplayDefaultScreen();
+ SAL_DLLPRIVATE static rtl::OUString GetDisplayScreenName( unsigned int nScreen );
static const LocaleDataWrapper& GetAppLocaleDataWrapper();
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index 19cce93d44dd..832ebd2cec17 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -241,10 +241,10 @@ public:
/**
Returns the screen number the window is on
- The screen number is counted the same way that
+ The Display Screen number is counted the same way that
<code>Application::GetScreenPosSizePixel</code>,
<code>Application::GetWorkAreaPosSizePixel</code>,
- <code>Application::GetScreenName</code>
+ <code>Application::GetDisplayScreenName</code>
and of course <code>SystemWindow::SetScreenNumber</code>
are counted in.
@@ -263,10 +263,10 @@ public:
Move the Window to a new screen. The same rules for
positioning apply as in <code>SystemWindow::GetScreenNumber</code>
- The screen number is counted the same way that
+ The Display Screen number is counted the same way that
<code>Application::GetScreenPosSizePixel</code>,
<code>Application::GetWorkAreaPosSizePixel</code>,
- <code>Application::GetScreenName</code>
+ <code>Application::GetDisplayScreenName</code>
and of course <code>SystemWindow::GetScreenNumber</code>
are counted in.
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index 8eb002af79a2..7bd092cd7624 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -69,10 +69,10 @@ public:
virtual ~WinSalSystem();
virtual unsigned int GetDisplayScreenCount();
- virtual unsigned int GetDefaultDisplayNumber();
+ virtual unsigned int GetDisplayDefaultScreen();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
- virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetScreenName( unsigned int nScreen );
+ virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
+ virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
const rtl::OUString& rMessage,
int nButtonCombination,