Diff of /trunk/src/geotext.c

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

revision 1 by harbaum, Sat Jun 20 11:08:47 2009 UTC revision 2 by harbaum, Sat Jun 20 11:44:14 2009 UTC
# Line 23  Line 23 
23  typedef struct {  typedef struct {
24    appdata_t *appdata;    appdata_t *appdata;
25    GtkTextBuffer *buffer;    GtkTextBuffer *buffer;
26    GtkWidget *entry, *label_sum, *menu;    GtkWidget *entry, *label_sum;
27    #ifndef NO_COPY_N_PASTE
28      GtkWidget *menu;
29    #endif
30  } geotext_context_t;  } geotext_context_t;
31    
32  /* buffer edited */  /* buffer edited */
# Line 95  static void on_right_shift_clicked(GtkBu Line 98  static void on_right_shift_clicked(GtkBu
98    text_shift((geotext_context_t*)data, +1);    text_shift((geotext_context_t*)data, +1);
99  }  }
100    
101    #ifndef NO_COPY_N_PASTE
102  static void  static void
103  cb_cut(GtkWidget *widget, gpointer data) {  cb_cut(GtkWidget *widget, gpointer data) {
104    geotext_context_t *context = (geotext_context_t*)data;    geotext_context_t *context = (geotext_context_t*)data;
# Line 150  static gint button_press(GtkWidget *widg Line 154  static gint button_press(GtkWidget *widg
154    /* Tell calling code that we have not handled this event; pass it on. */    /* Tell calling code that we have not handled this event; pass it on. */
155    return FALSE;    return FALSE;
156  }  }
157    #endif
158    
159  void geotext_dialog(appdata_t *appdata) {  void geotext_dialog(appdata_t *appdata) {
160    geotext_context_t context;    geotext_context_t context;
# Line 176  void geotext_dialog(appdata_t *appdata) Line 181  void geotext_dialog(appdata_t *appdata)
181    gtk_misc_set_alignment(GTK_MISC(label), 0.f, 0.5f);    gtk_misc_set_alignment(GTK_MISC(label), 0.f, 0.5f);
182    gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
183    
184    #ifndef NO_COPY_N_PASTE
185    GtkWidget *but = gtk_button_new_with_label(_("Edit"));    GtkWidget *but = gtk_button_new_with_label(_("Edit"));
186    gtk_widget_set_events(but, GDK_EXPOSURE_MASK);    gtk_widget_set_events(but, GDK_EXPOSURE_MASK);
187    gtk_widget_add_events(but, GDK_BUTTON_PRESS_MASK);    gtk_widget_add_events(but, GDK_BUTTON_PRESS_MASK);
188    gtk_signal_connect(GTK_OBJECT(but), "button-press-event",    gtk_signal_connect(GTK_OBJECT(but), "button-press-event",
189                       (GtkSignalFunc)button_press, &context);                       (GtkSignalFunc)button_press, &context);
190    gtk_box_pack_start(GTK_BOX(hbox), but, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), but, FALSE, FALSE, 0);
191    #endif
192    
193    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
194                       hbox, FALSE, FALSE, 0);                       hbox, FALSE, FALSE, 0);
Legend:
Removed from v.1  
changed lines
  Added in v.2