From: Dominic L. <ma...@us...> - 2004-08-16 19:19:41
|
Update of /cvsroot/robotflow/RobotFlow/Probes/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12814 Modified Files: VirtualJoystick.cc Log Message: removed all toggle buttons Index: VirtualJoystick.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/VirtualJoystick.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** VirtualJoystick.cc 16 Aug 2004 14:56:20 -0000 1.6 --- VirtualJoystick.cc 16 Aug 2004 19:19:23 -0000 1.7 *************** *** 169,172 **** --- 169,173 ---- gtk_signal_connect (GTK_OBJECT (m_pButton2), "released",GTK_SIGNAL_FUNC (button2_click),this); + /* // Joystick toggle button 3 tmp_toolbar_icon = gtk_button_new_with_label("T1"); *************** *** 193,197 **** //show button 4 gtk_widget_show (m_pButton4); ! } //create buttons widgets if required --- 194,199 ---- //show button 4 gtk_widget_show (m_pButton4); ! ! */ } //create buttons widgets if required *************** *** 371,375 **** if (m_buttonsVisible) { ! size = 6; } else { --- 373,377 ---- if (m_buttonsVisible) { ! size = 4; } else { *************** *** 386,391 **** (*data)[2] = (float) m_button1_on; (*data)[3] = (float) m_button2_on; ! (*data)[4] = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_pButton3)); ! (*data)[5] = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_pButton4)); } --- 388,393 ---- (*data)[2] = (float) m_button1_on; (*data)[3] = (float) m_button2_on; ! //(*data)[4] = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_pButton3)); ! //(*data)[5] = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_pButton4)); } |