Kaydet (Commit) 8be957ad authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Get rid of silly stderr0 macro

Change-Id: Ibc51fb4cc72163fb643a85ad3f0b6061b7d77ccc
üst 9236a99a
...@@ -351,12 +351,6 @@ inline Display *X11SalGraphics::GetXDisplay() const ...@@ -351,12 +351,6 @@ inline Display *X11SalGraphics::GetXDisplay() const
inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const
{ return GetColormap().GetPixel( nSalColor ); } { return GetColormap().GetPixel( nSalColor ); }
#ifdef DBG_UTIL
#define stderr0( s ) fprintf( stderr, s )
#else
#define stderr0( s ) ;
#endif
#endif // INCLUDED_VCL_INC_UNX_SALGDI_H #endif // INCLUDED_VCL_INC_UNX_SALGDI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -603,7 +603,7 @@ void X11SalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, ...@@ -603,7 +603,7 @@ void X11SalGraphicsImpl::copyBits( const SalTwoRect& rPosAry,
if( !xDDB ) if( !xDDB )
{ {
stderr0( "SalGraphics::CopyBits !pSrcGraphics->GetBitmap()\n" ); SAL_WARN( "vcl", "SalGraphics::CopyBits !pSrcGraphics->GetBitmap()" );
return; return;
} }
...@@ -613,7 +613,7 @@ void X11SalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, ...@@ -613,7 +613,7 @@ void X11SalGraphicsImpl::copyBits( const SalTwoRect& rPosAry,
drawBitmap( aPosAry, *xDDB ); drawBitmap( aPosAry, *xDDB );
} }
else { else {
stderr0( "X11SalGraphicsImpl::CopyBits from Printer not yet implemented\n" ); SAL_WARN( "vcl", "X11SalGraphicsImpl::CopyBits from Printer not yet implemented" );
} }
} }
...@@ -1667,7 +1667,7 @@ SalColor X11SalGraphicsImpl::getPixel( long nX, long nY ) ...@@ -1667,7 +1667,7 @@ SalColor X11SalGraphicsImpl::getPixel( long nX, long nY )
XGetWindowAttributes( mrParent.GetXDisplay(), mrParent.GetDrawable(), &aAttrib ); XGetWindowAttributes( mrParent.GetXDisplay(), mrParent.GetDrawable(), &aAttrib );
if( aAttrib.map_state != IsViewable ) if( aAttrib.map_state != IsViewable )
{ {
stderr0( "X11SalGraphics::GetPixel drawable not viewable\n" ); SAL_WARN( "vcl", "X11SalGraphics::GetPixel drawable not viewable" );
return 0; return 0;
} }
} }
...@@ -1680,7 +1680,7 @@ SalColor X11SalGraphicsImpl::getPixel( long nX, long nY ) ...@@ -1680,7 +1680,7 @@ SalColor X11SalGraphicsImpl::getPixel( long nX, long nY )
ZPixmap ); ZPixmap );
if( !pXImage ) if( !pXImage )
{ {
stderr0( "X11SalGraphics::GetPixel !XGetImage()\n" ); SAL_WARN( "vcl", "X11SalGraphics::GetPixel !XGetImage()" );
return 0; return 0;
} }
......
...@@ -1996,7 +1996,7 @@ void X11SalFrame::Minimize() ...@@ -1996,7 +1996,7 @@ void X11SalFrame::Minimize()
if( SHOWSTATE_UNKNOWN == nShowState_ || SHOWSTATE_HIDDEN == nShowState_ ) if( SHOWSTATE_UNKNOWN == nShowState_ || SHOWSTATE_HIDDEN == nShowState_ )
{ {
stderr0( "X11SalFrame::Minimize on withdrawn window\n" ); SAL_WARN( "vcl", "X11SalFrame::Minimize on withdrawn window" );
return; return;
} }
...@@ -2028,7 +2028,7 @@ void X11SalFrame::Restore() ...@@ -2028,7 +2028,7 @@ void X11SalFrame::Restore()
if( SHOWSTATE_UNKNOWN == nShowState_ || SHOWSTATE_HIDDEN == nShowState_ ) if( SHOWSTATE_UNKNOWN == nShowState_ || SHOWSTATE_HIDDEN == nShowState_ )
{ {
stderr0( "X11SalFrame::Restore on withdrawn window\n" ); SAL_WARN( "vcl", "X11SalFrame::Restore on withdrawn window" );
return; return;
} }
...@@ -3802,7 +3802,7 @@ long X11SalFrame::HandleClientMessage( XClientMessageEvent *pEvent ) ...@@ -3802,7 +3802,7 @@ long X11SalFrame::HandleClientMessage( XClientMessageEvent *pEvent )
#endif #endif
else if( pEvent->message_type == rWMAdaptor.getAtom( WMAdaptor::SAL_QUITEVENT ) ) else if( pEvent->message_type == rWMAdaptor.getAtom( WMAdaptor::SAL_QUITEVENT ) )
{ {
stderr0( "X11SalFrame::Dispatch Quit\n" ); SAL_WARN( "vcl", "X11SalFrame::Dispatch Quit" );
Close(); // ??? Close(); // ???
return 1; return 1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment