[Rojav-commits] rocgui/impl guiapp.cpp,1.43,1.44 item.cpp,1.29,1.30

[rob v. <ro...@us...>]

Update of /cvsroot/rojav/rocgui/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9773

Modified Files:
	guiapp.cpp item.cpp 
Log Message:
<No Comment Entered>

Index: item.cpp
===================================================================
RCS file: /cvsroot/rojav/rocgui/impl/item.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** item.cpp	28 Nov 2005 17:05:40 -0000	1.29
--- item.cpp	28 Nov 2005 20:22:07 -0000	1.30
***************
*** 44,47 ****
--- 44,48 ----
  #include "rocgui/dialogs/locdialog.h"
  #include "rocgui/dialogs/trackdialog.h"
+ #include "rocgui/dialogs/turntabledialog.h"
  
  #include "rocrail/wrapper/public/AutoCmd.h"
***************
*** 589,592 ****
--- 590,606 ----
      tkDlg->Destroy();
    }
+   else if( StrOp.equals( wTurntable.name(), name ) ) {
+     TurntableDialog* ttDlg = new TurntableDialog( this, m_Props );
+     if( wxID_OK == ttDlg->ShowModal() ) {
+       /* Notify RocRail. */
+       iONode cmd = NodeOp.inst( wModelCmd.name(), NULL, ELEMENT_NODE );
+       wModelCmd.setcmd( cmd, wModelCmd.modify );
+       NodeOp.addChild( cmd, (iONode)m_Props->base.clone( m_Props ) );
+       wxGetApp().sendToRocrail( cmd );
+       cmd->base.del(cmd);
+     }
+     Refresh();
+     ttDlg->Destroy();
+   }
    else {
      CRjPropDlg* propDlg = new CRjPropDlg(this, m_Props );

Index: guiapp.cpp
===================================================================
RCS file: /cvsroot/rojav/rocgui/impl/guiapp.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** guiapp.cpp	27 Nov 2005 21:45:33 -0000	1.43
--- guiapp.cpp	28 Nov 2005 20:22:07 -0000	1.44
***************
*** 563,569 ****
--- 563,571 ----
  */
              l_ActiveLocs->SetCellValue(l_ActiveLocs->GetNumberRows()-1, 0, id );
+             l_ActiveLocs->SetReadOnly( l_ActiveLocs->GetNumberRows()-1, 0, true );
  
              char* val = StrOp.fmt( "%d", wLoc.getaddr( lc ) );
              l_ActiveLocs->SetCellValue(l_ActiveLocs->GetNumberRows()-1, 1, val );
+             l_ActiveLocs->SetReadOnly( l_ActiveLocs->GetNumberRows()-1, 1, true );
              StrOp.free( val );
              iONode bk = findBlock4Loc(id);
***************
*** 571,574 ****
--- 573,577 ----
                l_ActiveLocs->SetCellValue(l_ActiveLocs->GetNumberRows()-1, 2, wBlock.getid( bk ) );
              }
+             l_ActiveLocs->SetReadOnly( l_ActiveLocs->GetNumberRows()-1, 2, true );
            }
          }