Diff of /trunk/src/gpxview.h

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

revision 12 by harbaum, Fri Jun 26 20:07:33 2009 UTC revision 129 by harbaum, Tue Sep 29 14:30:16 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 61  Line 65 
65  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
66  #define USE_PANNABLE_AREA  #define USE_PANNABLE_AREA
67  #include <hildon/hildon-pannable-area.h>  #include <hildon/hildon-pannable-area.h>
68    /* panning a gtkhtml view currently doesn't work well */
69    #define PANNABLE_HTML
70  #endif  #endif
71  #endif  #endif
72    
# Line 143  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 169  typedef struct { Line 179  typedef struct {
179    
180    gboolean cachelist_disable_screensaver;    gboolean cachelist_disable_screensaver;
181    gboolean goto_disable_screensaver;    gboolean goto_disable_screensaver;
   gboolean cachelist_update;  
182    
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    gboolean cachelist_update;
191    
192    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
193    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
194    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
195    GtkWidget *menu_search;    GtkWidget *menu_search;
196    
197      GtkWidget *bct;
198  #endif  #endif
199    
200    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
201    gpx_t *cur_gpx;    gpx_t *cur_gpx;
202    cache_t *cur_cache;    cache_t *cur_cache;
203    
204  #else    gpx_t *search_results;
205    GtkWidget *window;  
206    #ifdef ENABLE_OSM_GPS_MAP
207      struct {
208        struct map_context_s *context;
209        int source;
210        int zoom;
211        pos_t pos;
212      } map;
213  #endif  #endif
214    
215    GtkWidget *vbox;    GtkWidget *vbox;
216  } appdata_t;  } appdata_t;
217    
# Line 208  typedef struct { Line 230  typedef struct {
230  #include "precpos.h"  #include "precpos.h"
231  #include "garmin_export.h"  #include "garmin_export.h"
232    
233    #ifdef ENABLE_OSM_GPS_MAP
234    #include "map-tool.h"
235    #endif
236    
237  #ifdef USE_MAEMO  #ifdef USE_MAEMO
238  #include "dbus.h"  #include "dbus.h"
239  #endif  #endif
Legend:
Removed from v.12  
changed lines
  Added in v.129