INTEGRATION: CWS warnings01 (1.8.10); FILE MERGED

2006/05/23 23:19:24 sb 1.8.10.3: RESYNC: (1.8-1.9); FILE MERGED
2006/03/08 15:34:40 gh 1.8.10.2: remove wntmsci warnings
2006/02/02 09:19:59 gh 1.8.10.1: removed compiler warnings
This commit is contained in:
Jens-Heiner Rechtien 2006-06-19 23:23:47 +00:00
parent f671721d83
commit 1fef68b19a

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: recorder.cxx,v $ * $RCSfile: recorder.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: hr $ $Date: 2006-04-19 13:58:01 $ * last change: $Author: hr $ $Date: 2006-06-20 00:23:47 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -243,6 +243,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case STATE_CHECK: nMethod = M_Check; break; case STATE_CHECK: nMethod = M_Check; break;
case STATE_NOCHECK: nMethod = M_UnCheck; break; case STATE_NOCHECK: nMethod = M_UnCheck; break;
case STATE_DONTKNOW: nMethod = M_TriState; break; case STATE_DONTKNOW: nMethod = M_TriState; break;
default: nMethod = M_Check;
DBG_ERROR( "Unknown state in TriStateBox::GetState()" );
} }
StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod );
bSendData = TRUE; bSendData = TRUE;
@ -331,7 +333,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
// we have to find the current Button ID ourselves since it is not generated at this point :-( // we have to find the current Button ID ourselves since it is not generated at this point :-(
USHORT nCurrentButtonId = 0xffff; // Some wild value to wak up people USHORT nCurrentButtonId = 0xffff; // Some wild value to wak up people
int i; USHORT i;
for ( i = 0; i < pBD->GetButtonCount() ; i++ ) for ( i = 0; i < pBD->GetButtonCount() ; i++ )
{ {
if ( pBD->GetPushButton( pBD->GetButtonId(i) ) == pWin ) if ( pBD->GetPushButton( pBD->GetButtonId(i) ) == pWin )
@ -366,7 +368,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case WINDOW_OKBUTTON: nMethod = M_OK; break; case WINDOW_OKBUTTON: nMethod = M_OK; break;
case WINDOW_CANCELBUTTON: nMethod = M_Cancel; break; case WINDOW_CANCELBUTTON: nMethod = M_Cancel; break;
case WINDOW_HELPBUTTON: nMethod = M_Help; break; case WINDOW_HELPBUTTON: nMethod = M_Help; break;
default: Sound::Beep(); default: nMethod = M_OK;
DBG_ERROR( "Unknown Button" );
} }
StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod ); StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod );
bSendData = TRUE; bSendData = TRUE;
@ -425,6 +428,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_SPINFIELD_DOWN: nMethod = M_Less; break; case VCLEVENT_SPINFIELD_DOWN: nMethod = M_Less; break;
case VCLEVENT_SPINFIELD_FIRST: nMethod = M_ToMin; break; case VCLEVENT_SPINFIELD_FIRST: nMethod = M_ToMin; break;
case VCLEVENT_SPINFIELD_LAST: nMethod = M_ToMax; break; case VCLEVENT_SPINFIELD_LAST: nMethod = M_ToMax; break;
default: nMethod = M_ToMin;
DBG_ERROR( "Unknown EventID in Spinfield" );
} }
StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod );
bSendData = TRUE; bSendData = TRUE;
@ -645,7 +650,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{ {
// case 1 .. 0xffff: // case 1 .. 0xffff:
DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin ); DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode(); // BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode();
// break; // break;
/* case M_Dock : /* case M_Dock :
if ( ((DockingWindow*)pControl)->IsFloatingMode() ) if ( ((DockingWindow*)pControl)->IsFloatingMode() )
@ -698,7 +703,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case WINDOW_FLOATINGWINDOW: case WINDOW_FLOATINGWINDOW:
{ {
DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin ); DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
FloatingWindow *pFW = ((FloatingWindow*)pWin); // FloatingWindow *pFW = ((FloatingWindow*)pWin);
/* switch( nEventID ) /* switch( nEventID )
{ {
@ -978,7 +983,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
} // if } // if
else if ( pEvent->ISA( VclMenuEvent ) ) else if ( pEvent->ISA( VclMenuEvent ) )
{ {
VclMenuEvent* pMenuEvent = ( VclMenuEvent* ) pEvent; // VclMenuEvent* pMenuEvent = ( VclMenuEvent* ) pEvent;
} }