[libchamplain] Remove virtual methods of ChamplainLabel



commit a21244a8a3bd7ddb6a304b400b270a25fff1418d
Author: JiÅ?í Techet <techet gmail com>
Date:   Wed Feb 9 09:28:16 2011 +0100

    Remove virtual methods of ChamplainLabel
    
    Users can implement custom markers using CustomMarker so this should not
    be necessary

 champlain/champlain-label.c              |    8 +++-----
 champlain/champlain-label.h              |    4 ----
 docs/reference/libchamplain-sections.txt |   20 +++++++++++++++++---
 3 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/champlain/champlain-label.c b/champlain/champlain-label.c
index 8fdc34a..05becc7 100644
--- a/champlain/champlain-label.c
+++ b/champlain/champlain-label.c
@@ -434,8 +434,6 @@ champlain_label_class_init (ChamplainLabelClass *klass)
   actor_class->map = map;
   actor_class->unmap = unmap;
 
-  klass->draw_label = draw_label;
-  
   /**
    * ChamplainLabel:text:
    *
@@ -832,13 +830,13 @@ redraw_on_idle (gpointer gobject)
 {
   ChamplainLabel *label = CHAMPLAIN_LABEL (gobject);
 
-  CHAMPLAIN_LABEL_GET_CLASS (gobject)->draw_label (label);
+  draw_label (label);
   label->priv->redraw_id = 0;
   return FALSE;
 }
 
 
-/**
+/*
  * champlain_label_queue_redraw:
  * @label: a #ChamplainLabel
  *
@@ -849,7 +847,7 @@ redraw_on_idle (gpointer gobject)
  *
  * Since: 0.10
  */
-void
+static void
 champlain_label_queue_redraw (ChamplainLabel *label)
 {
   ChamplainLabelPrivate *priv = label->priv;
diff --git a/champlain/champlain-label.h b/champlain/champlain-label.h
index c01e1d1..0c03759 100644
--- a/champlain/champlain-label.h
+++ b/champlain/champlain-label.h
@@ -62,8 +62,6 @@ struct _ChamplainLabel
 struct _ChamplainLabelClass
 {
   ChamplainMarkerClass parent_class;
-
-  void (*draw_label)(ChamplainLabel *label);
 };
 
 GType champlain_label_get_type (void);
@@ -129,8 +127,6 @@ const ClutterColor *champlain_label_get_selection_color (void);
 void champlain_label_set_selection_text_color (ClutterColor *color);
 const ClutterColor *champlain_label_get_selection_text_color (void);
 
-void champlain_label_queue_redraw (ChamplainLabel *label);
-
 G_END_DECLS
 
 #endif
diff --git a/docs/reference/libchamplain-sections.txt b/docs/reference/libchamplain-sections.txt
index 4833266..0383942 100644
--- a/docs/reference/libchamplain-sections.txt
+++ b/docs/reference/libchamplain-sections.txt
@@ -74,7 +74,6 @@ champlain_label_set_selection_color
 champlain_label_get_selection_color
 champlain_label_set_selection_text_color
 champlain_label_get_selection_text_color
-champlain_label_queue_redraw
 <SUBSECTION Standard>
 CHAMPLAIN_LABEL
 CHAMPLAIN_IS_LABEL
@@ -92,7 +91,6 @@ ChamplainLabelPrivate
 <FILE>champlain-marker</FILE>
 <TITLE>ChamplainMarker</TITLE>
 ChamplainMarker
-champlain_marker_new
 champlain_marker_set_position
 champlain_marker_get_latitude
 champlain_marker_get_longitude
@@ -713,4 +711,20 @@ ChamplainMemphisRendererClass
 ChamplainMemphisRendererPrivate
 </SECTION>
 
-
+<SECTION>
+<FILE>champlain-custom-marker</FILE>
+<TITLE>ChamplainCustomMarker</TITLE>
+ChamplainCustomMarker
+champlain_custom_marker_new
+<SUBSECTION Standard>
+CHAMPLAIN_CUSTOM_MARKER
+CHAMPLAIN_IS_CUSTOM_MARKER
+CHAMPLAIN_TYPE_CUSTOM_MARKER
+champlain_custom_marker_get_type
+CHAMPLAIN_CUSTOM_MARKER_CLASS
+CHAMPLAIN_IS_CUSTOM_MARKER_CLASS
+CHAMPLAIN_CUSTOM_MARKER_GET_CLASS
+<SUBSECTION Private>
+ChamplainCustomMarkerClass
+ChamplainCustomMarkerPrivate
+</SECTION>



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