Enable a clear icon on entry boxes used for search like input.

[andy/viking.git] / src / uibuilder.h

diff --git a/src/uibuilder.h b/src/uibuilder.h
index 7052e5b18d0724576f4c9ad1dd33c5c3335d8df4..59539ada03ea23c99d135544be9eb76efcb9a51b 100644 (file)
--- a/src/uibuilder.h
+++ b/src/uibuilder.h
@@ -22,6 +22,8 @@
 #define _VIKING_UIBUILDER_H
 
 #include <gtk/gtk.h>
+#include "vik_compat.h"
+#include "config.h"
 
 G_BEGIN_DECLS
 
@@ -84,6 +86,9 @@ typedef enum {
   VIK_LAYER_GPS,
   VIK_LAYER_MAPS,
   VIK_LAYER_DEM,
+#ifdef HAVE_LIBMAPNIK
+  VIK_LAYER_MAPNIK,
+#endif
   VIK_LAYER_NUM_TYPES // Also use this value to indicate no layer association
 } VikLayerTypeEnum;
 
@@ -178,24 +183,12 @@ VikLayerParamData *a_uibuilder_run_dialog ( const gchar *dialog_name, GtkWindow
 /* frees data from last (if ness) */
 void a_uibuilder_free_paramdatas ( VikLayerParamData *paramdatas, VikLayerParam *params, guint16 params_count );
 
-/*
- * Since combo boxes are used in various places
- * keep the code reasonably tidy and only have one ifdef to cater for the naming variances
- */
-#if GTK_CHECK_VERSION (2, 24, 0)
-#define vik_combo_box_text_new gtk_combo_box_text_new
-#define vik_combo_box_text_append(X,Y) gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(X),Y)
-#else
-#define vik_combo_box_text_new gtk_combo_box_new_text
-#define vik_combo_box_text_append(X,Y) gtk_combo_box_append_text(GTK_COMBO_BOX(X),Y)
-#endif
-
-// Consider adding sort options such as by time
-//  However use within the treeview then is more complicated as one would need to store that data in the treeview...
 typedef enum {
   VL_SO_NONE = 0,
   VL_SO_ALPHABETICAL_ASCENDING,
   VL_SO_ALPHABETICAL_DESCENDING,
+  VL_SO_DATE_ASCENDING,
+  VL_SO_DATE_DESCENDING,
   VL_SO_LAST
 } vik_layer_sort_order_t;