Diff of /trunk/src/appdata.h

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

revision 64 by harbaum, Mon Feb 9 13:23:17 2009 UTC revision 112 by harbaum, Fri Mar 6 13:41:08 2009 UTC
# Line 42  Line 42 
42  #define GTK_FM_OK  GTK_RESPONSE_OK  #define GTK_FM_OK  GTK_RESPONSE_OK
43  #define HILDON_ENTRY_NO_AUTOCAP(a) \  #define HILDON_ENTRY_NO_AUTOCAP(a) \
44    hildon_gtk_entry_set_input_mode(GTK_ENTRY(a),HILDON_GTK_INPUT_MODE_FULL)    hildon_gtk_entry_set_input_mode(GTK_ENTRY(a),HILDON_GTK_INPUT_MODE_FULL)
45    
46    #ifndef HILDON_HARDKEY_FULLSCREEN
47    #define HILDON_HARDKEY_FULLSCREEN GDK_F6
48    #endif
49    
50    #ifndef HILDON_HARDKEY_INCREASE
51    #define HILDON_HARDKEY_INCREASE GDK_F7
52    #endif
53    
54    #ifndef HILDON_HARDKEY_DECREASE
55    #define HILDON_HARDKEY_DECREASE GDK_F8
56    #endif
57    
58  #else  #else
59  #define GTK_FM_OK  GTK_RESPONSE_ACCEPT  #define GTK_FM_OK  GTK_RESPONSE_ACCEPT
60  #define HILDON_ENTRY_NO_AUTOCAP(a)  #define HILDON_ENTRY_NO_AUTOCAP(a)
# Line 58  Line 71 
71  #include "osm.h"  #include "osm.h"
72    
73  #include "canvas.h"  #include "canvas.h"
74    #include "undo.h"
75    
76  #ifdef USE_HILDON  #ifdef USE_HILDON
77  #include "dbus.h"  #include "dbus.h"
# Line 122  typedef struct appdata_s { Line 136  typedef struct appdata_s {
136    GtkWidget *menu_item_osm_undo;    GtkWidget *menu_item_osm_undo;
137    GtkWidget *menu_item_osm_save_changes;    GtkWidget *menu_item_osm_save_changes;
138    GtkWidget *menu_item_osm_undo_changes;    GtkWidget *menu_item_osm_undo_changes;
139      GtkWidget *menu_item_osm_relations;
140    
141    GtkWidget *menu_wms;    GtkWidget *menu_wms;
142    GtkWidget *menu_item_wms_clear;    GtkWidget *menu_item_wms_clear;
# Line 133  typedef struct appdata_s { Line 148  typedef struct appdata_s {
148    GtkWidget *menu_item_map_no_icons;    GtkWidget *menu_item_map_no_icons;
149    GtkWidget *menu_item_map_no_antialias;    GtkWidget *menu_item_map_no_antialias;
150    
151    struct undo_state_s *undo_state;    undo_t undo;
152    
153  } appdata_t;  } appdata_t;
154    
# Line 158  typedef struct appdata_s { Line 173  typedef struct appdata_s {
173  #include "josm_elemstyles.h"  #include "josm_elemstyles.h"
174  #include "style.h"  #include "style.h"
175  #include "net_io.h"  #include "net_io.h"
 #include "qnd_xml.h"  
 #include "undo.h"  
176  #include "banner.h"  #include "banner.h"
177    
178  #endif // APPDATA_H  #endif // APPDATA_H
Legend:
Removed from v.64  
changed lines
  Added in v.112