Diff of /trunk/src/gpxview.h

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

revision 48 by harbaum, Fri Aug 7 07:57:33 2009 UTC revision 157 by harbaum, Tue Nov 3 20:20:39 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 141  typedef struct { Line 145  typedef struct {
145  #ifndef NO_COPY_N_PASTE  #ifndef NO_COPY_N_PASTE
146    /* do enable/disable the edit entries */    /* do enable/disable the edit entries */
147    GtkWidget *menu_cut, *menu_copy, *menu_paste;    GtkWidget *menu_cut, *menu_copy, *menu_paste;
   GtkClipboard *clipboard;     /* clipboard for copy/paste */  
148    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
149  #endif  #endif
150    
151      GtkClipboard *clipboard;     /* clipboard for copy/paste */
152    
153  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
154    GtkWidget *export_menu, *tools_menu;    GtkWidget *export_menu, *tools_menu;
155  #endif  #endif
# Line 175  typedef struct { Line 180  typedef struct {
180    
181    gboolean cachelist_disable_screensaver;    gboolean cachelist_disable_screensaver;
182    gboolean goto_disable_screensaver;    gboolean goto_disable_screensaver;
   gboolean cachelist_update;  
183    
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      gboolean cachelist_update;
192    
193  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
194    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
195    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
196    GtkWidget *menu_search;    GtkWidget *menu_search;
197    
198      GtkWidget *bct;
199  #endif  #endif
200    
201    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
202    gpx_t *cur_gpx;    gpx_t *cur_gpx;
203    cache_t *cur_cache;    cache_t *cur_cache;
204    
205  #else    gpx_t *search_results;
   GtkWidget *window;  
 #endif  
206    
207  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
208    struct {    struct {
209        struct map_context_s *context;
210        int source;
211      int zoom;      int zoom;
212      pos_t pos;      pos_t pos;
213    } map;    } map;
# Line 221  typedef struct { Line 230  typedef struct {
230  #include "mm_poi.h"  #include "mm_poi.h"
231  #include "precpos.h"  #include "precpos.h"
232  #include "garmin_export.h"  #include "garmin_export.h"
233    #include "gcvote.h"
234    
235  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
236  #include "map-tool.h"  #include "map-tool.h"
# Line 260  extern gboolean on_window_key_press(GtkW Line 270  extern gboolean on_window_key_press(GtkW
270  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
271  HildonAppMenu *menu_create(appdata_t *appdata, int mode);  HildonAppMenu *menu_create(appdata_t *appdata, int mode);
272  #endif  #endif
273    void cachelist_goto_cache(appdata_t *appdata, cache_t *cache);
274    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx);
275    
276  #endif // GPXVIEW_H  #endif // GPXVIEW_H
Legend:
Removed from v.48  
changed lines
  Added in v.157