diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-16 10:30:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-16 15:34:47 +0000 |
| commit | d9fa47c4dcbf95f5d3ca07fc3815d8ab9b2468eb (patch) | |
| tree | a08252eaccbf61a57ca1ce4914d37934a503d672 /vcl | |
| parent | ed7de95ca10fdf86f00772a7e7af093db0b85d43 (diff) | |
WaE: getXScreen is an unsigned int now
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/saldisp.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index f81f911984ae..4de2b336ef60 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -375,13 +375,14 @@ public: XIC = NULL ) const; XLIB_Cursor GetPointer( int ePointerStyle ); + sal_Bool IsLocal(); virtual int CaptureMouse( SalFrame *pCapture ); void Remove( XEvent *pEvent ); virtual ScreenData *initScreen( SalX11Screen nXScreen ) const; const ScreenData& getDataForScreen( SalX11Screen nXScreen ) const { - if( nXScreen.getXScreen() >= static_cast<int>(m_aScreens.size()) ) + if( nXScreen.getXScreen() >= static_cast<unsigned int>(m_aScreens.size()) ) return m_aInvalidScreenData; if( ! m_aScreens[nXScreen.getXScreen()].m_bInit ) initScreen( nXScreen ); diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 78853acc53c5..250ed1ced7e5 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -641,7 +641,7 @@ void SalX11Display::PostUserEvent() SalDisplay::ScreenData * SalDisplay::initScreen( SalX11Screen nXScreen ) const { - if( nXScreen.getXScreen() >= static_cast<int>(m_aScreens.size()) ) + if( nXScreen.getXScreen() >= static_cast<unsigned int>(m_aScreens.size()) ) nXScreen = m_nXDefaultScreen; ScreenData* pSD = const_cast<ScreenData *>(&m_aScreens[nXScreen.getXScreen()]); if( pSD->m_bInit ) |