Diff of /trunk/src/misc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 223 by harbaum, Tue Dec 1 20:03:51 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 2009 UTC
# Line 321  static gboolean mark(GtkWidget *widget, Line 321  static gboolean mark(GtkWidget *widget,
321    return valid;    return valid;
322  }  }
323    
324  GtkWidget *red_entry_new(void) {  GtkWidget *red_entry_new_with_text(char *str) {
325    GdkColor color;    GdkColor color;
326    
327    GtkWidget *widget = entry_new();    GtkWidget *widget = entry_new();
328    gdk_color_parse("#ff0000", &color);    gdk_color_parse("#ff0000", &color);
329    gtk_widget_modify_text(widget, TAG_STATE, &color);    gtk_widget_modify_text(widget, TAG_STATE, &color);
330      if(str) gtk_entry_set_text(GTK_ENTRY(widget), str);
331    
332    return widget;    return widget;
333  }  }
334    
# Line 611  GtkWidget *lat_entry_new(float lat) { Line 613  GtkWidget *lat_entry_new(float lat) {
613    pos_lat_str(str, sizeof(str), lat);    pos_lat_str(str, sizeof(str), lat);
614    
615  #ifndef COORDINATE_PICKER  #ifndef COORDINATE_PICKER
616    GdkColor color;    GtkWidget *widget = red_entry_new_with_text(str);
   
   GtkWidget *widget = entry_new();  
   gdk_color_parse("#ff0000", &color);  
   gtk_widget_modify_text(widget, TAG_STATE, &color);  
   
   gtk_entry_set_text(GTK_ENTRY(widget), str);  
617    
618    g_signal_connect(G_OBJECT(widget), "changed",    g_signal_connect(G_OBJECT(widget), "changed",
619                     G_CALLBACK(callback_modified_lat), NULL);                     G_CALLBACK(callback_modified_lat), NULL);
# Line 736  GtkWidget *lon_entry_new(float lon) { Line 732  GtkWidget *lon_entry_new(float lon) {
732    pos_lon_str(str, sizeof(str), lon);    pos_lon_str(str, sizeof(str), lon);
733    
734  #ifndef COORDINATE_PICKER  #ifndef COORDINATE_PICKER
735    GdkColor color;    GtkWidget *widget = red_entry_new_with_text(str);
   
   GtkWidget *widget = entry_new();  
   gdk_color_parse("#ff0000", &color);  
   gtk_widget_modify_text(widget, TAG_STATE, &color);  
   
   gtk_entry_set_text(GTK_ENTRY(widget), str);  
   
736    g_signal_connect(G_OBJECT(widget), "changed",    g_signal_connect(G_OBJECT(widget), "changed",
737                     G_CALLBACK(callback_modified_lon), NULL);                     G_CALLBACK(callback_modified_lon), NULL);
738    
# Line 941  GtkWidget *dist_entry_new(float dist, gb Line 930  GtkWidget *dist_entry_new(float dist, gb
930    distance_str(str, sizeof(str), dist, mil);    distance_str(str, sizeof(str), dist, mil);
931    
932  #ifndef COORDINATE_PICKER  #ifndef COORDINATE_PICKER
933    GdkColor color;    GtkWidget *widget = red_entry_new_with_text(str);
   GtkWidget *widget = entry_new();  
   gdk_color_parse("#ff0000", &color);  
   gtk_widget_modify_text(widget, TAG_STATE, &color);  
   
   gtk_entry_set_text(GTK_ENTRY(widget), str);  
   
934    g_signal_connect(G_OBJECT(widget), "changed",    g_signal_connect(G_OBJECT(widget), "changed",
935                     G_CALLBACK(callback_modified_dist), NULL);                     G_CALLBACK(callback_modified_dist), NULL);
936    
# Line 1674  GtkWidget *angle_entry_new(float angle) Line 1657  GtkWidget *angle_entry_new(float angle)
1657    angle_str(str, sizeof(str), angle);    angle_str(str, sizeof(str), angle);
1658    
1659  #ifndef COORDINATE_PICKER  #ifndef COORDINATE_PICKER
1660    GtkWidget *widget = red_entry_new();    GtkWidget *widget = red_entry_new_with_text(str);
   gtk_entry_set_text(GTK_ENTRY(widget), str);  
   
1661    g_signal_connect(G_OBJECT(widget), "changed",    g_signal_connect(G_OBJECT(widget), "changed",
1662                     G_CALLBACK(callback_modified_angle), NULL);                     G_CALLBACK(callback_modified_angle), NULL);
1663  #else  #else

Legend:
Removed from v.223  
changed lines
  Added in v.226