Diff of /trunk/src/gpxview.h

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

revision 17 by harbaum, Mon Jun 29 08:24:41 2009 UTC revision 128 by harbaum, Tue Sep 29 07:31:18 2009 UTC
# Line 37  Line 37 
37  #endif  #endif
38  #endif  #endif
39    
40    #ifdef BCT
41    #include "bct.h"
42    #endif
43    
44  #include "config.h"  #include "config.h"
45    
46  #include <string.h>  #include <string.h>
# Line 145  typedef struct { Line 149  typedef struct {
149    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
150  #endif  #endif
151    
152    #ifdef USE_STACKABLE_WINDOW
153      GtkWidget *export_menu, *tools_menu;
154    #endif
155    
156    /* save result here to be able to "goto" it */    /* save result here to be able to "goto" it */
157    pos_t geomath;    pos_t geomath;
158    
# Line 176  typedef struct { Line 184  typedef struct {
184    HildonProgram *program;    HildonProgram *program;
185    HildonWindow *window;    HildonWindow *window;
186    osso_context_t *osso_context;    osso_context_t *osso_context;
187    GtkWidget *bct;  #else
188    gpx_t *search_results;    GtkWidget *window;
189    #endif
190    
191  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
192    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
193    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
194    GtkWidget *menu_search;    GtkWidget *menu_search;
195    
196      GtkWidget *bct;
197  #endif  #endif
198    
199    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
200    gpx_t *cur_gpx;    gpx_t *cur_gpx;
201    cache_t *cur_cache;    cache_t *cur_cache;
202    
203  #else    gpx_t *search_results;
204    GtkWidget *window;  
205    #ifdef ENABLE_OSM_GPS_MAP
206      struct {
207        struct map_context_s *context;
208        int source;
209        int zoom;
210        pos_t pos;
211      } map;
212  #endif  #endif
213    
214    GtkWidget *vbox;    GtkWidget *vbox;
215  } appdata_t;  } appdata_t;
216    
# Line 210  typedef struct { Line 229  typedef struct {
229  #include "precpos.h"  #include "precpos.h"
230  #include "garmin_export.h"  #include "garmin_export.h"
231    
232    #ifdef ENABLE_OSM_GPS_MAP
233    #include "map-tool.h"
234    #endif
235    
236  #ifdef USE_MAEMO  #ifdef USE_MAEMO
237  #include "dbus.h"  #include "dbus.h"
238  #endif  #endif
Legend:
Removed from v.17  
changed lines
  Added in v.128