GNOME.org
 

[gtkmm] Wrapped some new GTK+ functions, removing some too.

commit 953a0268ee50daf13a75b8995f7c7eb439fe38cb
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 28 09:36:30 2011 +0100

    Wrapped some new GTK+ functions, removing some too.
    
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    * gtk/src/cellarea.hg: Remove set_style_detail() and get_style_detail().
    * gtk/src/cellrenderer.hg: Added get_state().
    * gtk/src/textview.hg: Added get_cursor_locations().

 ChangeLog                |    9 ++
 gtk/src/cellarea.hg      |    3 -
 gtk/src/cellrenderer.hg  |   15 +++
 gtk/src/gtk_methods.defs |  226 ++++++++++++++++++++++++++++++++--------------
 gtk/src/selectiondata.hg |    1 +
 gtk/src/targetlist.hg    |    2 +
 gtk/src/textview.hg      |    2 +
 7 files changed, 187 insertions(+), 71 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4f06115..970e9b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-28  Murray Cumming  <murrayc murrayc com>
+
+	Wrapped some new GTK+ functions, removing some too.
+
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/cellarea.hg: Remove set_style_detail() and get_style_detail().
+	* gtk/src/cellrenderer.hg: Added get_state().
+	* gtk/src/textview.hg: Added get_cursor_locations().
+	
 2011-01-27  Krzesimir Nowak  <qdlacz gmail com>
 
 	Fixed compilation errors introduced in previous changes.
diff --git a/gtk/src/cellarea.hg b/gtk/src/cellarea.hg
index ea57c10..aa6c797 100644
--- a/gtk/src/cellarea.hg
+++ b/gtk/src/cellarea.hg
@@ -51,9 +51,6 @@ public:
   //TODO: _WRAP_METHOD(void foreach_alloc(const Glib::RefPtr<CellAreaContext>& context,  Widget& widget, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& background_area,  GtkCellAllocCallback  callback,  gpointer  callback_data), gtk_cell_area_foreach_alloc
   _WRAP_METHOD(int event(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, GdkEvent* event, const Gdk::Rectangle& cell_area,  GtkCellRendererState  flags), gtk_cell_area_event)
   _WRAP_METHOD(void render(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, const Cairo::RefPtr<Cairo::Context>& cr, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, CellRendererState flags,  bool paint_focus), gtk_cell_area_render)
-  _WRAP_METHOD(void set_style_detail(const Glib::ustring& detail), gtk_cell_area_set_style_detail)
-  _WRAP_METHOD(Glib::ustring get_style_detail() const, gtk_cell_area_get_style_detail)
-
 
   _WRAP_METHOD(void get_cell_allocation(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, CellRenderer& renderer,  const Gdk::Rectangle& cell_area, Gdk::Rectangle& allocation), gtk_cell_area_get_cell_allocation)
   
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 29df206..90542af 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -95,6 +95,21 @@ public:
   _WRAP_METHOD(bool is_activatable() const, gtk_cell_renderer_is_activatable)
 
   _WRAP_METHOD(void stop_editing(bool canceled = false), gtk_cell_renderer_stop_editing)
+  
+  _WRAP_METHOD(StateFlags get_state(Widget& widget, CellRendererState cell_state) const, gtk_cell_renderer_get_state)
+  
+  
+  /** Translates the cell renderer state to StateFlags,
+   * based on the cell renderer and
+   * the given CellRendererState.
+   *
+   * @param cell_state The cell renderer state.
+   *
+   * @result The widget state flags applying to the cell renderer.
+   *
+   * @newin{3,0}
+   */
+  StateFlags get_state(CellRendererState cell_state) const;
 
   /** Returns the property that this CellRenderer renders.
    * For instance, property_text for CellRendererText, and property_active for CellRendererToggle
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index cc45436..755e7c5 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -89,6 +89,13 @@
   (gtype-id "GTK_TYPE_CELL_AREA_BOX_CONTEXT")
 )
 
+(define-object CellAreaBoxContext
+  (in-module "Gtk")
+  (parent "GtkCellAreaContext")
+  (c-name "GtkCellAreaBoxContext")
+  (gtype-id "GTK_TYPE_CELL_AREA_BOX_CONTEXT")
+)
+
 (define-object CellEditable
   (in-module "Gtk")
   (c-name "GtkCellEditable")
@@ -2996,6 +3003,10 @@
 
 
 
+;; From gtkaccelgroupprivate.h
+
+
+
 ;; From gtkaccellabel.h
 
 (define-function gtk_accel_label_get_type
@@ -4037,6 +4048,21 @@
   (return-type "gboolean")
 )
 
+(define-method set_heading
+  (of-object "GtkAppChooserButton")
+  (c-name "gtk_app_chooser_button_set_heading")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "heading")
+  )
+)
+
+(define-method get_heading
+  (of-object "GtkAppChooserButton")
+  (c-name "gtk_app_chooser_button_get_heading")
+  (return-type "const-gchar*")
+)
+
 
 
 ;; From gtkappchooserdialog.h
@@ -4073,6 +4099,21 @@
   (return-type "GtkWidget*")
 )
 
+(define-method set_heading
+  (of-object "GtkAppChooserDialog")
+  (c-name "gtk_app_chooser_dialog_set_heading")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "heading")
+  )
+)
+
+(define-method get_heading
+  (of-object "GtkAppChooserDialog")
+  (c-name "gtk_app_chooser_dialog_get_heading")
+  (return-type "const-gchar*")
+)
+
 
 
 ;; From gtkappchooser.h
@@ -5595,6 +5636,21 @@
 
 
 
+;; From gtkcellareaboxcontextprivate.h
+
+(define-function gtk_cell_area_box_init_groups
+  (c-name "gtk_cell_area_box_init_groups")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaBoxContext*" "box_context")
+    '("guint" "n_groups")
+    '("gboolean*" "expand_groups")
+    '("gboolean*" "align_groups")
+  )
+)
+
+
+
 ;; From gtkcellareabox.h
 
 (define-function gtk_cell_area_box_get_type
@@ -5838,21 +5894,6 @@
   )
 )
 
-(define-method set_style_detail
-  (of-object "GtkCellArea")
-  (c-name "gtk_cell_area_set_style_detail")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "detail")
-  )
-)
-
-(define-method get_style_detail
-  (of-object "GtkCellArea")
-  (c-name "gtk_cell_area_get_style_detail")
-  (return-type "const-gchar*")
-)
-
 (define-method get_cell_allocation
   (of-object "GtkCellArea")
   (c-name "gtk_cell_area_get_cell_allocation")
@@ -6648,6 +6689,16 @@
   )
 )
 
+(define-method get_state
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_get_state")
+  (return-type "GtkStateFlags")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkCellRendererState" "cell_state")
+  )
+)
+
 
 
 ;; From gtkcellrendererpixbuf.h
@@ -14415,7 +14466,7 @@
   (c-name "gtk_menu_set_active")
   (return-type "none")
   (parameters
-    '("guint" "index_")
+    '("guint" "index")
   )
 )
 
@@ -17806,6 +17857,21 @@
   (return-type "gdouble")
 )
 
+(define-method set_round_digits
+  (of-object "GtkRange")
+  (c-name "gtk_range_set_round_digits")
+  (return-type "none")
+  (parameters
+    '("gint" "round_digits")
+  )
+)
+
+(define-method get_round_digits
+  (of-object "GtkRange")
+  (c-name "gtk_range_get_round_digits")
+  (return-type "gint")
+)
+
 
 
 ;; From gtkrc.h
@@ -19205,6 +19271,11 @@
 
 ;; From gtkselection.h
 
+(define-function gtk_target_list_get_type
+  (c-name "gtk_target_list_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_target_list_new
   (c-name "gtk_target_list_new")
   (is-constructor-of "GtkTargetList")
@@ -19387,6 +19458,14 @@
   )
 )
 
+(define-function gtk_selection_remove_all
+  (c-name "gtk_selection_remove_all")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
 (define-method get_selection
   (of-object "GtkSelectionData")
   (c-name "gtk_selection_data_get_selection")
@@ -19574,14 +19653,6 @@
   )
 )
 
-(define-function gtk_selection_remove_all
-  (c-name "gtk_selection_remove_all")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
 (define-function gtk_selection_data_get_type
   (c-name "gtk_selection_data_get_type")
   (return-type "GType")
@@ -19609,7 +19680,7 @@
   (is-constructor-of "GtkTargetEntry")
   (return-type "GtkTargetEntry*")
   (parameters
-    '("const-char*" "target")
+    '("const-gchar*" "target")
     '("guint" "flags")
     '("guint" "info")
   )
@@ -19627,11 +19698,6 @@
   (return-type "none")
 )
 
-(define-function gtk_target_list_get_type
-  (c-name "gtk_target_list_get_type")
-  (return-type "GType")
-)
-
 
 
 ;; From gtkseparator.h
@@ -22329,6 +22395,48 @@
 
 
 
+;; From gtktextattributes.h
+
+(define-function gtk_text_attributes_new
+  (c-name "gtk_text_attributes_new")
+  (is-constructor-of "GtkTextAttributes")
+  (return-type "GtkTextAttributes*")
+)
+
+(define-method copy
+  (of-object "GtkTextAttributes")
+  (c-name "gtk_text_attributes_copy")
+  (return-type "GtkTextAttributes*")
+)
+
+(define-method copy_values
+  (of-object "GtkTextAttributes")
+  (c-name "gtk_text_attributes_copy_values")
+  (return-type "none")
+  (parameters
+    '("GtkTextAttributes*" "dest")
+  )
+)
+
+(define-method unref
+  (of-object "GtkTextAttributes")
+  (c-name "gtk_text_attributes_unref")
+  (return-type "none")
+)
+
+(define-method ref
+  (of-object "GtkTextAttributes")
+  (c-name "gtk_text_attributes_ref")
+  (return-type "GtkTextAttributes*")
+)
+
+(define-function gtk_text_attributes_get_type
+  (c-name "gtk_text_attributes_get_type")
+  (return-type "GType")
+)
+
+
+
 ;; From gtktextbuffer.h
 
 (define-function gtk_text_buffer_get_type
@@ -24327,44 +24435,6 @@
   )
 )
 
-(define-function gtk_text_attributes_new
-  (c-name "gtk_text_attributes_new")
-  (is-constructor-of "GtkTextAttributes")
-  (return-type "GtkTextAttributes*")
-)
-
-(define-method copy
-  (of-object "GtkTextAttributes")
-  (c-name "gtk_text_attributes_copy")
-  (return-type "GtkTextAttributes*")
-)
-
-(define-method copy_values
-  (of-object "GtkTextAttributes")
-  (c-name "gtk_text_attributes_copy_values")
-  (return-type "none")
-  (parameters
-    '("GtkTextAttributes*" "dest")
-  )
-)
-
-(define-method unref
-  (of-object "GtkTextAttributes")
-  (c-name "gtk_text_attributes_unref")
-  (return-type "none")
-)
-
-(define-method ref
-  (of-object "GtkTextAttributes")
-  (c-name "gtk_text_attributes_ref")
-  (return-type "GtkTextAttributes*")
-)
-
-(define-function gtk_text_attributes_get_type
-  (c-name "gtk_text_attributes_get_type")
-  (return-type "GType")
-)
-
 
 
 ;; From gtktexttagtable.h
@@ -24535,6 +24605,17 @@
   (return-type "gboolean")
 )
 
+(define-method get_cursor_locations
+  (of-object "GtkTextView")
+  (c-name "gtk_text_view_get_cursor_locations")
+  (return-type "none")
+  (parameters
+    '("const-GtkTextIter*" "iter")
+    '("GdkRectangle*" "strong")
+    '("GdkRectangle*" "weak")
+  )
+)
+
 (define-method get_iter_location
   (of-object "GtkTextView")
   (c-name "gtk_text_view_get_iter_location")
@@ -29350,6 +29431,15 @@
 
 
 
+;; From gtktypeutils.h
+
+(define-function gtk_identifier_get_type
+  (c-name "gtk_identifier_get_type")
+  (return-type "GType")
+)
+
+
+
 ;; From gtkuimanager.h
 
 (define-function gtk_ui_manager_get_type
diff --git a/gtk/src/selectiondata.hg b/gtk/src/selectiondata.hg
index 6abe9c9..14bd798 100644
--- a/gtk/src/selectiondata.hg
+++ b/gtk/src/selectiondata.hg
@@ -92,6 +92,7 @@ public:
   _WRAP_METHOD(const guchar* get_data() const, gtk_selection_data_get_data)
   _WRAP_METHOD(int get_length() const, gtk_selection_data_get_length)
 
+  //TODO: Documentation
   std::string get_data_as_string() const;
 
 #m4 _CONVERSION(`GdkAtom',`std::string',`Gdk::AtomString::to_cpp_type ($3)')
diff --git a/gtk/src/targetlist.hg b/gtk/src/targetlist.hg
index 571556f..e327b50 100644
--- a/gtk/src/targetlist.hg
+++ b/gtk/src/targetlist.hg
@@ -30,6 +30,8 @@ namespace Gtk
 
 class TargetList
 {
+  //GtkTargetList is actually registered as a boxed type, but it has custom 
+  //reference-counting instead of copy/free functions, so we use it via RefPtr.
   _CLASS_OPAQUE_REFCOUNTED(TargetList, GtkTargetList, NONE, gtk_target_list_ref, gtk_target_list_unref)
   _IGNORE(gtk_selection_data_copy, gtk_selection_data_free)
 public:
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index a98fce9..2ff0c43 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -123,6 +123,8 @@ public:
   _WRAP_METHOD(void get_visible_rect(Gdk::Rectangle& visible_rect) const, gtk_text_view_get_visible_rect)
   _WRAP_METHOD(void set_cursor_visible(bool setting = true), gtk_text_view_set_cursor_visible)
   _WRAP_METHOD(bool get_cursor_visible() const, gtk_text_view_get_cursor_visible)
+  
+  _WRAP_METHOD(void get_cursor_locations(const TextBuffer::iterator& iter,  Gdk::Rectangle& strong,  Gdk::Rectangle& weak) const, gtk_text_view_get_cursor_locations)
 
   _WRAP_METHOD(void get_iter_location(const TextBuffer::iterator&  iter, Gdk::Rectangle& location) const, gtk_text_view_get_iter_location)
   _WRAP_METHOD(void get_iter_at_location(TextBuffer::iterator& iter, int x, int y) const, gtk_text_view_get_iter_at_location)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]