Kaydet (Commit) ee466e67 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS warnings01 (1.15.74); FILE MERGED

2006/03/24 15:36:06 fs 1.15.74.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro)
üst bdc57f5e
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: RelationControl.cxx,v $ * $RCSfile: RelationControl.cxx,v $
* *
* $Revision: 1.15 $ * $Revision: 1.16 $
* *
* last change: $Author: hr $ $Date: 2005-09-23 12:23:20 $ * last change: $Author: hr $ $Date: 2006-06-20 02:59:20 $
* *
* 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.
...@@ -155,7 +155,7 @@ namespace dbaui ...@@ -155,7 +155,7 @@ namespace dbaui
virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const; virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const;
virtual BOOL SeekRow( long nRow ); virtual BOOL SeekRow( long nRow );
virtual BOOL SaveModified(); virtual BOOL SaveModified();
virtual String GetCellText( long nRow, USHORT nColId ); virtual String GetCellText( long nRow, USHORT nColId ) const;
virtual void CellModified(); virtual void CellModified();
...@@ -164,6 +164,7 @@ namespace dbaui ...@@ -164,6 +164,7 @@ namespace dbaui
DECL_LINK( AsynchActivate, void* ); DECL_LINK( AsynchActivate, void* );
DECL_LINK( AsynchDeactivate, void* ); DECL_LINK( AsynchDeactivate, void* );
}; };
//======================================================================== //========================================================================
// class ORelationControl // class ORelationControl
//======================================================================== //========================================================================
...@@ -173,10 +174,10 @@ namespace dbaui ...@@ -173,10 +174,10 @@ namespace dbaui
:EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_3DLOOK | WB_BORDER ) :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_3DLOOK | WB_BORDER )
,m_pListCell( NULL ) ,m_pListCell( NULL )
,m_pConnData( NULL ) ,m_pConnData( NULL )
,m_xSourceDef( NULL )
,m_xDestDef( NULL )
,m_pTableMap(_pTableMap) ,m_pTableMap(_pTableMap)
,m_pBoxControl(pParent) ,m_pBoxControl(pParent)
,m_xSourceDef( NULL )
,m_xDestDef( NULL )
{ {
DBG_CTOR(ORelationControl,NULL); DBG_CTOR(ORelationControl,NULL);
} }
...@@ -317,7 +318,7 @@ namespace dbaui ...@@ -317,7 +318,7 @@ namespace dbaui
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
String ORelationControl::GetCellText( long nRow, USHORT nColId ) String ORelationControl::GetCellText( long nRow, USHORT nColId ) const
{ {
DBG_CHKTHIS(ORelationControl,NULL); DBG_CHKTHIS(ORelationControl,NULL);
String sText; String sText;
...@@ -341,7 +342,7 @@ namespace dbaui ...@@ -341,7 +342,7 @@ namespace dbaui
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ORelationControl::InitController( CellControllerRef& rController, long nRow, USHORT nColumnId ) void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId )
{ {
DBG_CHKTHIS(ORelationControl,NULL); DBG_CHKTHIS(ORelationControl,NULL);
...@@ -375,7 +376,7 @@ namespace dbaui ...@@ -375,7 +376,7 @@ namespace dbaui
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
CellController* ORelationControl::GetController( long nRow, USHORT nColumnId ) CellController* ORelationControl::GetController( long /*nRow*/, USHORT /*nColumnId*/ )
{ {
DBG_CHKTHIS(ORelationControl,NULL); DBG_CHKTHIS(ORelationControl,NULL);
return new ListBoxCellController( m_pListCell ); return new ListBoxCellController( m_pListCell );
...@@ -461,7 +462,7 @@ namespace dbaui ...@@ -461,7 +462,7 @@ namespace dbaui
if ( pConn ) if ( pConn )
{ {
m_pConnData->CopyFrom(*pConn->GetData()); m_pConnData->CopyFrom(*pConn->GetData());
m_pBoxControl->getContainer()->notifyConnectionChange(m_pConnData); m_pBoxControl->getContainer()->notifyConnectionChange();
} }
else else
{ {
...@@ -506,9 +507,9 @@ OTableListBoxControl::OTableListBoxControl(Window* _pParent, ...@@ -506,9 +507,9 @@ OTableListBoxControl::OTableListBoxControl(Window* _pParent,
const OJoinTableView::OTableWindowMap* _pTableMap, const OJoinTableView::OTableWindowMap* _pTableMap,
IRelationControlInterface* _pParentDialog) IRelationControlInterface* _pParentDialog)
: Window(_pParent,_rResId) : Window(_pParent,_rResId)
, m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES))
, m_lmbLeftTable( this, ResId(LB_LEFT_TABLE)) , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE))
, m_lmbRightTable( this, ResId(LB_RIGHT_TABLE)) , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE))
, m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES))
, m_aFL_InvolvedFields( this, ResId(FL_INVOLVED_FIELDS)) , m_aFL_InvolvedFields( this, ResId(FL_INVOLVED_FIELDS))
, m_pTableMap(_pTableMap) , m_pTableMap(_pTableMap)
, m_pParentDialog(_pParentDialog) , m_pParentDialog(_pParentDialog)
......
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