INTEGRATION: CWS cups01 (1.12.26); FILE MERGED

2003/08/15 13:21:14 pl 1.12.26.1: removed a bunch of warnings
This commit is contained in:
Oliver Bolte 2004-03-17 09:44:38 +00:00
parent b2794e6c37
commit 0d62f6ce8c

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: helper.cxx,v $ * $RCSfile: helper.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: vg $ $Date: 2003-05-28 12:36:09 $ * last change: $Author: obo $ $Date: 2004-03-17 10:44:38 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -246,13 +246,13 @@ long DelListBox::Notify( NotifyEvent& rEvent )
*/ */
QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const ::std::list< String >& rChoices ) : QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const ::std::list< String >& rChoices ) :
m_rReturnValue( rRet ),
ModalDialog( pParent, PaResId( RID_STRINGQUERYDLG ) ), ModalDialog( pParent, PaResId( RID_STRINGQUERYDLG ) ),
m_aOKButton( this, PaResId( RID_STRQRY_BTN_OK ) ), m_aOKButton( this, PaResId( RID_STRQRY_BTN_OK ) ),
m_aCancelButton( this, PaResId( RID_STRQRY_BTN_CANCEL ) ),
m_aFixedText( this, PaResId( RID_STRQRY_TXT_RENAME ) ),
m_aEdit( this, PaResId( RID_STRQRY_EDT_NEWNAME ) ), m_aEdit( this, PaResId( RID_STRQRY_EDT_NEWNAME ) ),
m_aComboBox( this, PaResId( RID_STRQRY_BOX_NEWNAME ) ), m_aComboBox( this, PaResId( RID_STRQRY_BOX_NEWNAME ) ),
m_aFixedText( this, PaResId( RID_STRQRY_TXT_RENAME ) ), m_rReturnValue( rRet )
m_aCancelButton( this, PaResId( RID_STRQRY_BTN_CANCEL ) )
{ {
m_aOKButton.SetClickHdl( LINK( this, QueryString, ClickBtnHdl ) ); m_aOKButton.SetClickHdl( LINK( this, QueryString, ClickBtnHdl ) );
m_aFixedText.SetText( rQuery ); m_aFixedText.SetText( rQuery );