gEDA-cvs: CVS update: x_dialog.nw

[cvspsrv@xxxxxxxx]

  User: danmc   
  Date: 05/09/09 08:05:00

  Modified:    .        x_dialog.nw
  Log:
  don't declare variables in the middle of functions.  Not all compilers like
  
  that.
  
  
  
  
  Revision  Changes    Path
  1.35      +6 -5      eda/geda/devel/gschem/noweb/x_dialog.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: x_dialog.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/x_dialog.nw,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- x_dialog.nw	20 Aug 2005 02:08:10 -0000	1.34
  +++ x_dialog.nw	9 Sep 2005 12:05:00 -0000	1.35
  @@ -901,6 +901,7 @@
     char *text_size_string;
     int len;
     int num_selected;
  +  int select_index=0;
   
     num_selected = o_selection_return_num(w_current->page_current->selection2_head);
     
  @@ -977,7 +978,6 @@
       gtk_widget_show(label);
       
       optionmenu = gtk_option_menu_new();
  -    int select_index=0;
       
       gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), create_color_menu(w_current, &select_index));
       gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), select_index);
  @@ -3466,14 +3466,15 @@
     char *temp=NULL;
     int found=0;
   
  -  menu = gtk_menu_new ();
  -  group = NULL;
  -
     /* first lets see if we have a selected object, if so select its color */
     int select_col = -1;
     int item_index = 0;
     SELECTION *s_current = NULL;
     OBJECT *object = NULL;
  +
  +  menu = gtk_menu_new ();
  +  group = NULL;
  +
     /* skip over head */
     s_current = w_current->page_current->selection2_head->next;
   
  @@ -3651,6 +3652,7 @@
     GtkWidget *buttonapply = NULL;
     GtkWidget *optionmenu;
     GtkWidget *vbox, *action_area;
  +  int select_index = 0;
   
     if (!w_current->clwindow) {
       w_current->clwindow = x_create_dialog_box(&vbox, &action_area);
  @@ -3679,7 +3681,6 @@
   #endif
   
       optionmenu = gtk_option_menu_new ();
  -    int select_index = 0;
       gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu),
                                create_color_menu (w_current, &select_index));
       gtk_option_menu_set_history(GTK_OPTION_MENU (optionmenu), select_index);