diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-01-11 11:10:11 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-01-11 11:10:11 +0100 |
commit | 322a75edf8bad6616b1543a6b81972f4c3765ee2 (patch) | |
tree | 727d1f3bfc1d951d13a2f461410f6549070b31d3 /vcl/unx/gtk | |
parent | 1c6de4e777704030c332e40ffc1d06765d469919 (diff) |
removetootypes01: #i112600# Use correct conversion ULONG => sal_uIntPtr
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkobject.cxx | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index de3d46733bfd..104aa2e80dd3 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -527,7 +527,7 @@ public: YieldFunc handle ); virtual void Remove( int fd ); - virtual void StartTimer( sal_uInt32 nMS ); + virtual void StartTimer( sal_uIntPtr nMS ); virtual void StopTimer(); virtual void Wakeup(); virtual void PostUserEvent(); @@ -727,7 +727,7 @@ gboolean GtkXLib::timeoutFn(gpointer data) return FALSE; } -void GtkXLib::StartTimer( sal_uInt32 nMS ) +void GtkXLib::StartTimer( sal_uIntPtr nMS ) { m_nTimeoutMS = nMS; // for restarting diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index f58f49865f7c..df7ce072bde7 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -65,7 +65,7 @@ void GtkHookedYieldMutex::ThreadsEnter() acquire(); if( !aYieldStack.empty() ) { /* Previously called ThreadsLeave() */ - sal_uInt32 nCount = aYieldStack.front(); + sal_uIntPtr nCount = aYieldStack.front(); aYieldStack.pop_front(); while( nCount-- > 1 ) acquire(); @@ -188,12 +188,12 @@ GtkInstance::~GtkInstance() DeInitAtkBridge(); } -SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ) +SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ) { return new GtkSalFrame( pParent, nStyle ); } -SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uInt32 ) +SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uIntPtr ) { SalFrame* pFrame = new GtkSalFrame( pParentData ); diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index f3026be3dbb1..dfb311fa9c8d 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -479,7 +479,7 @@ void GtkSalGraphics::ResetClipRegion() X11SalGraphics::ResetClipRegion(); } -void GtkSalGraphics::BeginSetClipRegion( sal_uInt32 nCount ) +void GtkSalGraphics::BeginSetClipRegion( sal_uIntPtr nCount ) { m_aClipRegion.SetNull(); X11SalGraphics::BeginSetClipRegion( nCount ); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 2b6cf8dc4484..4ef66f746b49 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -392,7 +392,7 @@ GtkSalFrame::GraphicsHolder::~GraphicsHolder() delete pGraphics; } -GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uInt32 nStyle ) +GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uIntPtr nStyle ) { m_nScreen = getDisplay()->GetDefaultScreenNumber(); getDisplay()->registerFrame( this ); @@ -755,7 +755,7 @@ GtkSalFrame *GtkSalFrame::getFromWindow( GtkWindow *pWindow ) return (GtkSalFrame *) g_object_get_data( G_OBJECT( pWindow ), "SalFrame" ); } -void GtkSalFrame::Init( SalFrame* pParent, sal_uInt32 nStyle ) +void GtkSalFrame::Init( SalFrame* pParent, sal_uIntPtr nStyle ) { if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style { @@ -1043,7 +1043,7 @@ void GtkSalFrame::SetTitle( const String& rTitle ) } static inline sal_uInt8 * -getRow( BitmapBuffer *pBuffer, sal_uInt32 nRow ) +getRow( BitmapBuffer *pBuffer, sal_uIntPtr nRow ) { if( BMP_SCANLINE_ADJUSTMENT( pBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) return pBuffer->mpBits + nRow * pBuffer->mnScanlineSize; @@ -1602,7 +1602,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) if( ! m_pWindow || ! pState || isChild( true, false ) ) return; - const sal_uInt32 nMaxGeometryMask = + const sal_uIntPtr nMaxGeometryMask = SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y | SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT | SAL_FRAMESTATE_MASK_MAXIMIZED_X | SAL_FRAMESTATE_MASK_MAXIMIZED_Y | @@ -2462,7 +2462,7 @@ void GtkSalFrame::ResetClipRegion() gdk_window_shape_combine_region( m_pWindow->window, NULL, 0, 0 ); } -void GtkSalFrame::BeginSetClipRegion( sal_uInt32 ) +void GtkSalFrame::BeginSetClipRegion( sal_uIntPtr ) { if( m_pRegion ) gdk_region_destroy( m_pRegion ); @@ -2702,7 +2702,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame GtkSalFrame* pThis = (GtkSalFrame*)frame; GdkEventScroll* pSEvent = (GdkEventScroll*)pEvent; - static sal_uInt32 nLines = 0; + static sal_uIntPtr nLines = 0; if( ! nLines ) { char* pEnv = getenv( "SAL_WHEELLINES" ); @@ -2714,8 +2714,8 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame bool bNeg = (pSEvent->direction == GDK_SCROLL_DOWN || pSEvent->direction == GDK_SCROLL_RIGHT ); SalWheelMouseEvent aEvent; aEvent.mnTime = pSEvent->time; - aEvent.mnX = (sal_uInt32)pSEvent->x; - aEvent.mnY = (sal_uInt32)pSEvent->y; + aEvent.mnX = (sal_uIntPtr)pSEvent->x; + aEvent.mnY = (sal_uIntPtr)pSEvent->y; aEvent.mnDelta = bNeg ? -120 : 120; aEvent.mnNotchDelta = bNeg ? -1 : 1; aEvent.mnScrollLines = nLines; diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index f8cb73c16c15..96648ce02d30 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -109,7 +109,7 @@ sal_uInt16 GtkSalObject::GetClipRegionType() return SAL_OBJECT_CLIP_INCLUDERECTS; } -void GtkSalObject::BeginSetClipRegion( sal_uInt32 ) +void GtkSalObject::BeginSetClipRegion( sal_uIntPtr ) { if( m_pRegion ) gdk_region_destroy( m_pRegion ); |