Diff of /trunk/src/gpxview.h

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

revision 20 by harbaum, Sat Jul 4 19:42:28 2009 UTC revision 126 by harbaum, Mon Sep 28 19:01:03 2009 UTC
# Line 35  Line 35 
35  #define MENU_CACHELIST 1  #define MENU_CACHELIST 1
36  #define MENU_CACHE     2  #define MENU_CACHE     2
37  #endif  #endif
38    #else
39    #define MY_BCT   /* use custom breadcrumbtrail */
40    #include "bct.h"
41  #endif  #endif
42    
43  #include "config.h"  #include "config.h"
# Line 180  typedef struct { Line 183  typedef struct {
183    HildonProgram *program;    HildonProgram *program;
184    HildonWindow *window;    HildonWindow *window;
185    osso_context_t *osso_context;    osso_context_t *osso_context;
186    GtkWidget *bct;  #else
187    gpx_t *search_results;    GtkWidget *window;
188    #endif
189    
190  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)
191    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
192    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
193    GtkWidget *menu_search;    GtkWidget *menu_search;
 #endif  
194    
195    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
196    gpx_t *cur_gpx;    gpx_t *cur_gpx;
197    cache_t *cur_cache;    cache_t *cur_cache;
198    
199  #else    GtkWidget *bct;
200    GtkWidget *window;  #endif
201    
202      gpx_t *search_results;
203    
204    #ifdef ENABLE_OSM_GPS_MAP
205      struct {
206        struct map_context_s *context;
207        int source;
208        int zoom;
209        pos_t pos;
210      } map;
211  #endif  #endif
212    
213    GtkWidget *vbox;    GtkWidget *vbox;
214  } appdata_t;  } appdata_t;
215    
# Line 214  typedef struct { Line 228  typedef struct {
228  #include "precpos.h"  #include "precpos.h"
229  #include "garmin_export.h"  #include "garmin_export.h"
230    
231    #ifdef ENABLE_OSM_GPS_MAP
232    #include "map-tool.h"
233    #endif
234    
235  #ifdef USE_MAEMO  #ifdef USE_MAEMO
236  #include "dbus.h"  #include "dbus.h"
237  #endif  #endif

Legend:
Removed from v.20  
changed lines
  Added in v.126