INTEGRATION: CWS obo17 (1.4.6); FILE MERGED

2007/10/18 07:45:53 obo 1.4.6.1: #150903# unxmacxi support

3 files changed, 31 insertions, 30 deletions

diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx
index a91e1054a419..69574c4862e1 100644
--- a/soldep/source/connctr.cxx
+++ b/soldep/source/connctr.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: connctr.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 23:38:02 $
+ *  last change: $Author: vg $ $Date: 2007-10-22 14:43:22 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -47,8 +47,8 @@ mpStartWin( 0L ),
 mpEndWin( 0L ),
 mnStartId( 0 ),
 mnEndId( 0 ),
-len( 70 ),
-bVisible( FALSE )
+bVisible( FALSE ),
+len( 70 )
 {
     mpParent = pParent;
     if ( mpParent )
@@ -281,4 +281,4 @@ ULONG Connector::GetLen()
 BOOL Connector::IsStart( ObjectWin* pWin )
 {
     return pWin == mpStartWin;
-}
\ No newline at end of file
+}
diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx
index 857340b63707..8ac2534421e5 100644
--- a/soldep/source/objwin.cxx
+++ b/soldep/source/objwin.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: objwin.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 23:39:13 $
+ *  last change: $Author: vg $ $Date: 2007-10-22 14:43:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -82,17 +82,17 @@ UINT32 aColorMap[] = {
 ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )
 /*****************************************************************************/
                 : Window( pParent, nWinStyle ),
-                mnObjectId( 0 ),
                 msBodyText( "" ),
                 msTipText( "" ),
-                mnRootDist( 0 ),
-                mnHeadDist( 0 ),
-                mbVisited( FALSE ),
-                mbFixed( FALSE ),
+                mnObjectId( 0 ),
                 mnMarkMode( 0 ),
                 mnViewMask( 0 ),
                 mbVisible( FALSE ),
-                mbMenuExecute( FALSE )
+                mbMenuExecute( FALSE ),
+                mbVisited( FALSE ),
+                mnRootDist( 0 ),
+                mnHeadDist( 0 ),
+                mbFixed( FALSE )
 {
     SetBackground( Wallpaper( Color( COL_WHITE )));
 
@@ -206,8 +206,9 @@ Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )
     USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;
     USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;
 
-    if ( nRefX < 0 ) nRefX = 0;
-    if ( nRefY < 0 ) nRefY = 0;
+    // always false...
+    //if ( nRefX < 0 ) nRefX = 0;
+    //if ( nRefY < 0 ) nRefY = 0;
 
     if ( rRefPoint.X() > nRefX )
     {
@@ -332,7 +333,7 @@ void ObjectWin::SetAllConnectorsUnvisible()
 {
     Connector* pCon;
     ULONG nConCount = mConnections.Count();
-    for ( int i = 0; i < nConCount; i++ )
+    for ( ULONG i = 0; i < nConCount; i++ )
     {
         pCon = mConnections.GetObject( i );
         if (pCon) pCon->SetVisibility( FALSE );
@@ -563,7 +564,7 @@ void ObjectWin::MouseMove( const MouseEvent& rMEvt )
         aNewWinPos.X() = Max( 0L, aNewWinPos.X());
         aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());
         SetPosPixel( aNewWinPos );
-        int t = mConnections.Count();
+        //int t = mConnections.Count();
 
         for ( i=0; i < mConnections.Count();i++)
         {
@@ -623,9 +624,9 @@ void ObjectWin::UpdateConnectors()
     }
 }
 
-IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup )
+IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )
 {
-    USHORT nItemId = mpPopup->GetCurItemId();
+    USHORT nItemId = mpPopup_l->GetCurItemId();
 
     switch( nItemId )
     {
@@ -649,6 +650,7 @@ IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup )
         default :
 //          DBG_ASSERT( FALSE, String (nItemId) );
             Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems );
+            pCon = 0;
 //          delete pCon;
 //          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());
 //          TBD: CallEventListener
@@ -695,7 +697,7 @@ void ObjectWin::LoseFocus()
 }
 
 /*****************************************************************************/
-IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup )
+IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )
 /*****************************************************************************/
 {
     mbMenuExecute = FALSE;
@@ -733,10 +735,9 @@ void ObjectList::ResetSelectedObject()
 {
 //    return;
 
-    ULONG i = 0;
-    ULONG nCount = Count();
+    ULONG nCount_l = Count();
     ObjectWin* pObjectWin = NULL;
-    for (ULONG i=0; i < nCount; i++ )
+    for (ULONG i=0; i < nCount_l; i++ )
     {
         pObjectWin = GetObject( i );
         pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );
@@ -753,9 +754,9 @@ ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )
 /*****************************************************************************/
 {
     ULONG i = 0;
-    ULONG nCount = Count();
+    ULONG nCount_l = Count();
     ObjectWin* pObjectWin = NULL;
-    while ( i < nCount )
+    while ( i < nCount_l )
     {
        pObjectWin = GetObject( i );
        ByteString sPrj = pObjectWin->GetBodyText();
@@ -763,4 +764,4 @@ ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )
        i++;
     }
     return 0;
-}
+}
\ No newline at end of file
diff --git a/soldep/source/soldlg.cxx b/soldep/source/soldlg.cxx
index 2f7a02996f3d..6a6981493d60 100644
--- a/soldep/source/soldlg.cxx
+++ b/soldep/source/soldlg.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: soldlg.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 23:39:48 $
+ *  last change: $Author: vg $ $Date: 2007-10-22 14:44:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -235,12 +235,12 @@ SolAutoarrangeDlg::SolAutoarrangeDlg( Window *pParent )
                 maOverallBar( this )
 {
     FreeResource();
-
+/* Mac Porting..... taking address of temporary (warning)
     maModuleBar.SetPosPixel( POS( 8, 28 ));
     maOverallBar.SetPosPixel( POS( 8, 60 ));
     maModuleBar.SetSizePixel( SIZE( 208,12 ));
     maOverallBar.SetSizePixel( SIZE( 208,12 ));
-
+*/
     maModuleBar.Show();
     maOverallBar.Show();