[libchamplainmm] View: Fix various compilation issues



commit 78eb62a4caf9e761e9abe93623afc3273b42aad1
Author: Juan R. GarcĂ­a Blanco <juanrgar gmail com>
Date:   Tue Feb 25 20:27:43 2014 +0100

    View: Fix various compilation issues
    
        * Remove ScrollMode enum.
        * Remove get/set_scroll_mode() methods.
        * Remove ::scroll-mode property.
        * Comment out ensure_visible() method due to
        unavailability of ChamplainBoundingBox.

 libchamplain/src/view.hg |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/libchamplain/src/view.hg b/libchamplain/src/view.hg
index 6cccc0b..9ccd09e 100644
--- a/libchamplain/src/view.hg
+++ b/libchamplain/src/view.hg
@@ -31,8 +31,6 @@ _PINCLUDE(cluttermm/private/group_p.h)
 namespace Champlain
 {
 
-_WRAP_ENUM(ScrollMode, ChamplainScrollMode)
-
 class BaseMarker;
 class Layer;
 class MapSource;
@@ -59,8 +57,6 @@ public:
                champlain_view_get_map_source)
   _WRAP_METHOD(double get_decel_rate() const,
                champlain_view_get_decel_rate)
-  _WRAP_METHOD(ScrollMode get_scroll_mode() const,
-               champlain_view_get_scroll_mode)
   _WRAP_METHOD(bool get_keep_center_on_resize() const,
                champlain_view_get_keep_center_on_resize)
   _WRAP_METHOD(guint get_max_zoom_level() const,
@@ -87,10 +83,10 @@ public:
   _WRAP_METHOD(void set_min_zoom_level(guint zoom_level),
                champlain_view_set_min_zoom_level)
 
-  _WRAP_METHOD(void ensure_visible(double lat1, double lon1,
-                                   double lat2, double lon2,
-                                   bool animate),
-               champlain_view_ensure_visible)
+//  _WRAP_METHOD(void ensure_visible(double lat1, double lon1,
+//                                   double lat2, double lon2,
+//                                   bool animate),
+//               champlain_view_ensure_visible)
   _WRAP_METHOD(
       void ensure_markers_visible(
           const Glib::ArrayHandle<Glib::RefPtr<BaseMarker> > & markers,
@@ -103,8 +99,6 @@ public:
                champlain_view_set_size)
   _WRAP_METHOD(void set_decel_rate(double rate),
                champlain_view_set_decel_rate)
-  _WRAP_METHOD(void set_scroll_mode(ScrollMode mode),
-               champlain_view_set_scroll_mode)
   _WRAP_METHOD(void set_keep_center_on_resize(bool value),
                champlain_view_set_keep_center_on_resize)
   _WRAP_METHOD(void set_show_license(bool value),
@@ -136,7 +130,6 @@ public:
   _WRAP_PROPERTY("min-zoom-level", int)
   _WRAP_PROPERTY("max-zoom-level", int)
   _WRAP_PROPERTY("map-source", Glib::RefPtr<MapSource>)
-  _WRAP_PROPERTY("scroll-mode", ScrollMode)
   _WRAP_PROPERTY("decel-rate", double)
   _WRAP_PROPERTY("keep-center-on-resize", bool)
   _WRAP_PROPERTY("show-license", bool)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]