[Robotflow-cvs] RobotFlow/Probes/src VirtualJoystick.cc,1.5,1.6

[Dominic L. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Probes/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24212

Modified Files:
	VirtualJoystick.cc 
Log Message:
Do not display handle box if no buttons are present

Index: VirtualJoystick.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/VirtualJoystick.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VirtualJoystick.cc	16 Aug 2004 14:50:47 -0000	1.5
--- VirtualJoystick.cc	16 Aug 2004 14:56:20 -0000	1.6
***************
*** 117,133 ****
      gtk_widget_show (m_pVbox2);
      gtk_container_add (GTK_CONTAINER (m_pWindow1), m_pVbox2);
- 
      
-     //create handlebox
-     handlebox = gtk_handle_box_new ();
-     gtk_widget_ref (handlebox);
-     gtk_object_set_data_full (GTK_OBJECT (m_pWindow1), "handlebox", handlebox,(GtkDestroyNotify) gtk_widget_unref);
-     gtk_widget_show (handlebox);
-     gtk_box_pack_start (GTK_BOX (m_pVbox2), handlebox, FALSE, FALSE, 0);
-     gtk_handle_box_set_snap_edge (GTK_HANDLE_BOX (handlebox), GTK_POS_LEFT);
- 
      //create toolbar if user wants to display buttons
      if (m_buttonsVisible) {
! 
        m_pToolbar2 = gtk_toolbar_new ();
        
--- 117,132 ----
      gtk_widget_show (m_pVbox2);
      gtk_container_add (GTK_CONTAINER (m_pWindow1), m_pVbox2);
      
      //create toolbar if user wants to display buttons
      if (m_buttonsVisible) {
!     
!       //create handlebox
!       handlebox = gtk_handle_box_new ();
!       gtk_widget_ref (handlebox);
!       gtk_object_set_data_full (GTK_OBJECT (m_pWindow1), "handlebox", handlebox,(GtkDestroyNotify) gtk_widget_unref);
!       gtk_widget_show (handlebox);
!       gtk_box_pack_start (GTK_BOX (m_pVbox2), handlebox, FALSE, FALSE, 0);
!       gtk_handle_box_set_snap_edge (GTK_HANDLE_BOX (handlebox), GTK_POS_LEFT);
!       
        m_pToolbar2 = gtk_toolbar_new ();
        
***************
*** 204,211 ****
  
      if (m_buttonsVisible) {
!       gtk_window_set_default_size(GTK_WINDOW(m_pWindow1), 500,500);
      }
      else {
!       gtk_window_set_default_size(GTK_WINDOW(m_pWindow1), 350,400);
      }
  
--- 203,210 ----
  
      if (m_buttonsVisible) {
!       gtk_window_set_default_size(GTK_WINDOW(m_pWindow1), 450,500);
      }
      else {
!       gtk_window_set_default_size(GTK_WINDOW(m_pWindow1), 350,350);
      }