GNOME.org
 

gtkmm r1003 - in trunk: . gtk/src pango

Author: murrayc
Date: Mon Jul 14 13:15:02 2008
New Revision: 1003
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1003&view=rev

Log:
2008-07-14  Murray Cumming  <murrayc murrayc com>

* gtk/src/Makefile_list_of_hg.am_fragment:
* gtk/src/gtk_vfuncs.defs:
* gtk/src/toolshell.hg: Added ToolShell, though it is not used 
by anything yet, to avoid breaking ABI.
* gtk/src/accelgroup.hg: Added get_is_locked() and 
get_modifier_mask().
* gtk/src/plug.hg: Added get_embedded() and get_socket_window().
* gtk/src/selectiondata.ccg:
* gtk/src/selectiondata.hg: Reimplemented get_data(), 
get_data_type(), get_format(), and get_display() with the new 
accessorfunctions.

* gtk/src/dialog.hg: Reimplemented get_action_area() and 
get_content_area() with the new accessor functions.
* gtk/src/entry.hg: Added get/set_overwrite_mode().
Reimplemented get_text_length() with the new accessor function.
* gtk/src/handlebox.ccg: Reimplemented is_child_detached() with 
gtk_handle_box_get_child_detached().
* gtk/src/handlebox.hg:
* gtk/src/layout.hg: Reimplemented get_bin_window() with the 
new accessor function.
* gtk/src/image.hg: Added a set() overload that takes a 
Gio::Icon, wrapping gtk_image_set_from_gicon().
* gtk/src/menu.hg: Added get_accel_path() and get_monitor().
* gtk/src/menuitem.hg: Added get_accel_path(). 
Added right-justified and submenu properties.
* gtk/src/messagedialog.hg: Added get_image().
* gtk/src/socket.hg: Added get_plug_window().
* gtk/src/treeviewcolumn.hg: Added get_tree_view(().
* pango/pangomm-1.4.pc.in: Depend on cairomm, because it does.

Added:
   trunk/gtk/src/toolshell.ccg
      - copied unchanged from r1002, /trunk/gtk/src/editable.ccg
   trunk/gtk/src/toolshell.hg
      - copied, changed from r1002, /trunk/gtk/src/editable.hg
Modified:
   trunk/ChangeLog
   trunk/gtk/src/Makefile_list_of_hg.am_fragment
   trunk/gtk/src/accelgroup.hg
   trunk/gtk/src/action.hg
   trunk/gtk/src/dialog.hg
   trunk/gtk/src/entry.hg
   trunk/gtk/src/gtk_vfuncs.defs
   trunk/gtk/src/handlebox.ccg
   trunk/gtk/src/handlebox.hg
   trunk/gtk/src/image.hg
   trunk/gtk/src/layout.hg
   trunk/gtk/src/menu.hg
   trunk/gtk/src/menuitem.hg
   trunk/gtk/src/messagedialog.hg
   trunk/gtk/src/plug.hg
   trunk/gtk/src/selectiondata.ccg
   trunk/gtk/src/selectiondata.hg
   trunk/gtk/src/socket.hg
   trunk/gtk/src/treeviewcolumn.hg
   trunk/pango/pangomm-1.4.pc.in

Modified: trunk/gtk/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- trunk/gtk/src/Makefile_list_of_hg.am_fragment	(original)
+++ trunk/gtk/src/Makefile_list_of_hg.am_fragment	Mon Jul 14 13:15:02 2008
@@ -32,7 +32,7 @@
           table.hg targetlist.hg tearoffmenuitem.hg \
           textattributes.hg textbuffer.hg textchildanchor.hg textiter.hg textmark.hg texttag.hg texttagtable.hg textview.hg \
           toggleaction.hg \
-          togglebutton.hg toggletoolbutton.hg toolbar.hg toolitem.hg toolbutton.hg tooltips.hg tooltip.hg \
+          togglebutton.hg toggletoolbutton.hg toolbar.hg toolitem.hg toolbutton.hg toolshell.hg tooltips.hg tooltip.hg \
           treedragdest.hg treedragsource.hg treepath.hg treerowreference.hg treeselection.hg treesortable.hg \
           treeiter.hg treemodel.hg treemodelfilter.hg treemodelsort.hg treestore.hg treeview.hg treeviewcolumn.hg \
           viewport.hg volumebutton.hg uimanager.hg \

Modified: trunk/gtk/src/accelgroup.hg
==============================================================================
--- trunk/gtk/src/accelgroup.hg	(original)
+++ trunk/gtk/src/accelgroup.hg	Mon Jul 14 13:15:02 2008
@@ -57,6 +57,9 @@
    */
   _WRAP_CREATE()
 
+  _WRAP_METHOD(bool get_is_locked() const, gtk_accel_group_get_is_locked)
+  _WRAP_METHOD(Gdk::ModifierType get_modifier_mask() const, gtk_accel_group_get_modifier_mask)
+
   _WRAP_METHOD(void lock(), gtk_accel_group_lock)
   _WRAP_METHOD(void unlock(), gtk_accel_group_unlock)
   _WRAP_METHOD(bool disconnect_key(guint accel_key, Gdk::ModifierType accel_mods), gtk_accel_group_disconnect_key)

Modified: trunk/gtk/src/action.hg
==============================================================================
--- trunk/gtk/src/action.hg	(original)
+++ trunk/gtk/src/action.hg	Mon Jul 14 13:15:02 2008
@@ -183,6 +183,10 @@
   _WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_action_set_accel_path)
   _WRAP_METHOD(void set_accel_group(const Glib::RefPtr<AccelGroup>& accel_group), gtk_action_set_accel_group)
 
+
+  //gtk_action_get_accel_closure() is too C-specific:
+  _IGNORE(gtk_action_get_accel_closure)
+
   _WRAP_PROPERTY("name", Glib::ustring)
   _WRAP_PROPERTY("label", Glib::ustring)
   _WRAP_PROPERTY("short_label", Glib::ustring)

Modified: trunk/gtk/src/dialog.hg
==============================================================================
--- trunk/gtk/src/dialog.hg	(original)
+++ trunk/gtk/src/dialog.hg	Mon Jul 14 13:15:02 2008
@@ -109,8 +109,13 @@
   _WRAP_METHOD(void response(int response_id), gtk_dialog_response)
   _WRAP_METHOD(int run(), gtk_dialog_run)
 
-  _MEMBER_GET_PTR(vbox, vbox, VBox*, GtkWidget*)
-  _MEMBER_GET_PTR(action_area, action_area, HButtonBox*, GtkWidget*)
+  _WRAP_METHOD(HButtonBox* get_action_area(), gtk_dialog_get_action_area)
+  _WRAP_METHOD(const HButtonBox* get_action_area() const, gtk_dialog_get_action_area, constversion)
+
+  //TODO: Rename to get_content_area() when we do an ABI break.
+  //We kept it as get_vbox() when reimplementing a MEMBER_GET with this new C function:
+  _WRAP_METHOD(VBox* get_vbox(), gtk_dialog_get_content_area)
+  _WRAP_METHOD(const VBox* get_vbox() const, gtk_dialog_get_content_area)
 
   _WRAP_PROPERTY("has_separator", bool)
 

Modified: trunk/gtk/src/entry.hg
==============================================================================
--- trunk/gtk/src/entry.hg	(original)
+++ trunk/gtk/src/entry.hg	Mon Jul 14 13:15:02 2008
@@ -72,8 +72,11 @@
   _WRAP_METHOD(void set_inner_border(const Border& border), gtk_entry_set_inner_border)
   _WRAP_METHOD(Border get_inner_border() const, gtk_entry_get_inner_border)
 
+  _WRAP_METHOD(void set_overwrite_mode(bool overwrite = true), gtk_entry_set_overwrite_mode)
+  _WRAP_METHOD(bool get_overwrite_mode() const, gtk_entry_get_overwrite_mode)
   _WRAP_METHOD(void set_max_length(int max), gtk_entry_set_max_length)
   _WRAP_METHOD(int get_max_length() const, gtk_entry_get_max_length)
+  _WRAP_METHOD(guint16 get_text_length() const, gtk_entry_get_text_length)
   _WRAP_METHOD(void set_activates_default(bool setting = true), gtk_entry_set_activates_default)
   _WRAP_METHOD(gboolean get_activates_default() const, gtk_entry_get_activates_default)
   _WRAP_METHOD(void set_width_chars(int n_chars), gtk_entry_set_width_chars)
@@ -99,8 +102,6 @@
   _WRAP_METHOD(Glib::RefPtr<EntryCompletion> get_completion(), gtk_entry_get_completion, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const EntryCompletion> get_completion() const, gtk_entry_get_completion, refreturn, constversion)
 
-  _MEMBER_GET(text_length, text_length, guint16, guint16)
-
   _WRAP_SIGNAL(void populate_popup(Menu* menu), "populate_popup")
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)

Modified: trunk/gtk/src/gtk_vfuncs.defs
==============================================================================
--- trunk/gtk/src/gtk_vfuncs.defs	(original)
+++ trunk/gtk/src/gtk_vfuncs.defs	Mon Jul 14 13:15:02 2008
@@ -1154,3 +1154,32 @@
     '("gint" "page_nr")
   )
 )
+
+; GtkToolShell
+
+(define-vfunc get_icon_size
+  (of-object "GtkToolShell")
+  (return-type "GtkIconSize")
+)
+
+(define-vfunc get_orientation
+  (of-object "GtkToolShell")
+  (return-type "GtkOrientation")
+)
+
+(define-vfunc get_style
+  (of-object "GtkToolShell")
+  (return-type "GtkToolbarStyle")
+)
+
+(define-vfunc get_relief_style
+  (of-object "GtkToolShell")
+  (return-type "GtkReliefStyle")
+)
+
+(define-vfunc rebuild_menu
+  (of-object "GtkToolShell")
+  (return-type "none")
+)
+
+

Modified: trunk/gtk/src/handlebox.ccg
==============================================================================
--- trunk/gtk/src/handlebox.ccg	(original)
+++ trunk/gtk/src/handlebox.ccg	Mon Jul 14 13:15:02 2008
@@ -28,7 +28,7 @@
 
 bool HandleBox::is_child_detached() const
 {
-  return gobj()->child_detached;
+  return gtk_handle_box_get_child_detached(const_cast<GtkHandleBox*>(gobj()));
 }
 
 bool HandleBox::is_float_window_mapped() const

Modified: trunk/gtk/src/handlebox.hg
==============================================================================
--- trunk/gtk/src/handlebox.hg	(original)
+++ trunk/gtk/src/handlebox.hg	Mon Jul 14 13:15:02 2008
@@ -59,7 +59,10 @@
   _MEMBER_GET_GOBJECT(bin_window, bin_window, Gdk::Window, GdkWindow*)
   _MEMBER_GET_GOBJECT(float_window, float_window, Gdk::Window, GdkWindow*)
 
+  //TODO: Documentation:
   bool is_child_detached() const;
+  _IGNORE(gtk_handle_box_get_child_detached)
+
   bool is_float_window_mapped() const;
   bool is_in_drag() const;
   bool shrinks_on_detach() const;

Modified: trunk/gtk/src/image.hg
==============================================================================
--- trunk/gtk/src/image.hg	(original)
+++ trunk/gtk/src/image.hg	Mon Jul 14 13:15:02 2008
@@ -120,10 +120,11 @@
   _WRAP_METHOD(void set(const Gtk::StockID& stock_id, IconSize size), gtk_image_set_from_stock)
   _WRAP_METHOD(void set(IconSet& icon_set, IconSize size), gtk_image_set_from_icon_set)
   _WRAP_METHOD(void set(const Glib::RefPtr<Gdk::PixbufAnimation>& animation), gtk_image_set_from_animation)
-
+  _WRAP_METHOD(void set(const Glib::RefPtr<const Gio::Icon>& icon, IconSize size), gtk_image_set_from_gicon)
 
   _WRAP_METHOD(void set_from_icon_name(const Glib::ustring& icon_name, IconSize size), gtk_image_set_from_icon_name)
 
+
   _WRAP_METHOD(void clear(), gtk_image_clear)
 
   _WRAP_METHOD(ImageType get_storage_type() const, gtk_image_get_storage_type)

Modified: trunk/gtk/src/layout.hg
==============================================================================
--- trunk/gtk/src/layout.hg	(original)
+++ trunk/gtk/src/layout.hg	Mon Jul 14 13:15:02 2008
@@ -54,6 +54,9 @@
   Layout();
   Layout(Adjustment& hadjustment, Adjustment& vadjustment);
 
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_bin_window(), gtk_layout_get_bin_window, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_bin_window() const, gtk_layout_get_bin_window, refreturn, constversion)
+
   _WRAP_METHOD(void put(Widget& child_widget, int x, int y), gtk_layout_put)
   _WRAP_METHOD(void move(Widget& child_widget, int x, int y), gtk_layout_move)
   _WRAP_METHOD(void set_size(guint width, guint height), gtk_layout_set_size)
@@ -72,8 +75,6 @@
   _WRAP_METHOD(Adjustment* get_vadjustment(), gtk_layout_get_vadjustment)
   _WRAP_METHOD(const Adjustment* get_vadjustment() const, gtk_layout_get_vadjustment, constversion)
 
-  _MEMBER_GET_GOBJECT(bin_window, bin_window, Gdk::Window, GdkWindow*)
-
   // See Gtk::Widget::set_scroll_adjustments()
   _WRAP_SIGNAL(void set_scroll_adjustments(Adjustment* hadj, Adjustment* vadj), "set_scroll_adjustments")
 

Modified: trunk/gtk/src/menu.hg
==============================================================================
--- trunk/gtk/src/menu.hg	(original)
+++ trunk/gtk/src/menu.hg	Mon Jul 14 13:15:02 2008
@@ -95,6 +95,7 @@
   _WRAP_METHOD(Glib::RefPtr<const AccelGroup> get_accel_group() const, gtk_menu_get_accel_group, refreturn, constversion)
   
   _WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_menu_set_accel_path)
+  _WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_menu_get_accel_path)
 
   _WRAP_METHOD(void detach(),gtk_menu_detach)
   _WRAP_METHOD(Widget* get_attach_widget(), gtk_menu_get_attach_widget)
@@ -111,6 +112,7 @@
   _WRAP_METHOD(void attach(Gtk::Widget& child, guint left_attach, guint right_attach, guint top_attach, guint bottom_attach), gtk_menu_attach)
 
   _WRAP_METHOD(void set_monitor(int monitor_num), gtk_menu_set_monitor)
+  _WRAP_METHOD(int get_monitor() const, gtk_menu_get_monitor)
   
   void reorder_child(const MenuItem& child, int position);
   _IGNORE(gtk_menu_reorder_child)

Modified: trunk/gtk/src/menuitem.hg
==============================================================================
--- trunk/gtk/src/menuitem.hg	(original)
+++ trunk/gtk/src/menuitem.hg	Mon Jul 14 13:15:02 2008
@@ -68,6 +68,7 @@
   _WRAP_METHOD(bool get_right_justified() const, gtk_menu_item_get_right_justified)
   _WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_menu_item_set_accel_path)
   void unset_accel_path();
+  _WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_menu_item_get_accel_path)
 
   _WRAP_SIGNAL(void activate(), "activate")
   _WRAP_SIGNAL(void activate_item(), "activate_item")
@@ -76,6 +77,10 @@
 
   void accelerate(Window& window);
 
+  _WRAP_PROPERTY("right-justified", bool)
+  _WRAP_PROPERTY("submenu", Gtk::Menu*)
+
+
 protected:
 
   void add_accel_label(const Glib::ustring& label, bool mnemonic = true);

Modified: trunk/gtk/src/messagedialog.hg
==============================================================================
--- trunk/gtk/src/messagedialog.hg	(original)
+++ trunk/gtk/src/messagedialog.hg	Mon Jul 14 13:15:02 2008
@@ -55,6 +55,8 @@
   _IGNORE(gtk_message_dialog_new, gtk_message_dialog_new_with_markup)
 
   _WRAP_METHOD(void set_image(Widget& image), gtk_message_dialog_set_image)
+  _WRAP_METHOD(Widget* get_image(), gtk_message_dialog_get_image)
+  _WRAP_METHOD(const Widget* get_image() const, gtk_message_dialog_get_image, constversion)
 
   _WRAP_METHOD(void set_markup(const Glib::ustring& str), gtk_message_dialog_set_markup, deprecated "Use set_message(string, true).")
 

Modified: trunk/gtk/src/plug.hg
==============================================================================
--- trunk/gtk/src/plug.hg	(original)
+++ trunk/gtk/src/plug.hg	Mon Jul 14 13:15:02 2008
@@ -36,6 +36,11 @@
 
   _WRAP_METHOD(GdkNativeWindow get_id() const, gtk_plug_get_id)
 
+  _WRAP_METHOD(bool get_embedded() const, gtk_plug_get_embedded)
+
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_socket_window(), gtk_plug_get_socket_window, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_socket_window() const, gtk_plug_get_socket_window, refreturn, constversion)
+
   _WRAP_PROPERTY("embedded", bool)
   _WRAP_PROPERTY("socket-window", Glib::RefPtr<Gdk::Window>)
 

Modified: trunk/gtk/src/selectiondata.ccg
==============================================================================
--- trunk/gtk/src/selectiondata.ccg	(original)
+++ trunk/gtk/src/selectiondata.ccg	Mon Jul 14 13:15:02 2008
@@ -68,13 +68,13 @@
 std::string SelectionData::get_target() const
 {
   return Glib::convert_return_gchar_ptr_to_stdstring(
-      gdk_atom_name(const_cast<GtkSelectionData*>(gobj())->target));
+      gdk_atom_name( gtk_selection_data_get_target(const_cast<GtkSelectionData*>(gobj())) ) );
 }
 
 Gdk::ArrayHandle_AtomString SelectionData::get_targets() const
 {
   GdkAtom* targets = 0;
-  int    n_targets = 0;
+  int n_targets = 0;
 
   if(!gtk_selection_data_get_targets(const_cast<GtkSelectionData*>(gobj()), &targets, &n_targets))
     n_targets = 0; // it's set to -1 otherwise
@@ -87,8 +87,21 @@
 std::string SelectionData::get_data_type() const
 {
   return Glib::convert_return_gchar_ptr_to_stdstring(
-      gdk_atom_name(const_cast<GtkSelectionData*>(gobj())->type));
+    gdk_atom_name( gtk_selection_data_get_data_type(const_cast<GtkSelectionData*>(gobj())) ) );
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+const guint8* SelectionData::get_data() const
+{
+  return gobj()->data;
+}
+ 
+int SelectionData::get_length() const
+{
+  return gobj()->length;
+}
+#endif // GTKMM_DISABLE_DEPRECATED
+ 
+
 } // namespace Gtk
 

Modified: trunk/gtk/src/selectiondata.hg
==============================================================================
--- trunk/gtk/src/selectiondata.hg	(original)
+++ trunk/gtk/src/selectiondata.hg	Mon Jul 14 13:15:02 2008
@@ -85,12 +85,25 @@
   _WRAP_METHOD(bool set_uris(const Glib::StringArrayHandle& uris), gtk_selection_data_set_uris)
   _WRAP_METHOD(Glib::StringArrayHandle get_uris() const, gtk_selection_data_get_uris)
 
-  _MEMBER_GET(data, data, const guint8*, const guint8*)
-  _MEMBER_GET(length, length, int, gint)
+
+  _WRAP_METHOD(const guchar* get_data(guint& length) const, gtk_selection_data_get_data)
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+  /// @deprecated Use the get_data() method that also provides both the data and length.
+  const guint8* get_data() const;
+
+  /// @deprecated Use the get_data() method that also provides both the data and length.
+  int get_length() const;
+#endif // GTKMM_DISABLE_DEPRECATED
 
   std::string get_data_as_string() const;
 
+  /** Retrieves the target of the selection.
+   *
+   * Since: 2.14
+   **/
   std::string get_target() const;
+  _IGNORE(gtk_selection_data_get_target)
 
   /// See also Gtk::Clipboard::request_targets()
   Gdk::ArrayHandle_AtomString get_targets() const;
@@ -103,9 +116,12 @@
   /** Returns the type of the data as set by SelectionData::set().
    */
   std::string get_data_type() const; // get_type() already exists
+  _IGNORE(gtk_selection_data_get_data_type)
+
+  _WRAP_METHOD(int get_format() const, gtk_selection_data_get_format)
 
-  _MEMBER_GET(format, format, int, gint)
-  _MEMBER_GET_GOBJECT(display, display, Gdk::Display, GdkDisplay*)
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Display> get_display(), gtk_selection_data_get_display, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Display> get_display() const, gtk_selection_data_get_display, refreturn, constversion)
 
   _WRAP_METHOD(bool targets_include_uri() const, gtk_selection_data_targets_include_uri)
   _WRAP_METHOD(bool targets_include_text() const, gtk_selection_data_targets_include_text)

Modified: trunk/gtk/src/socket.hg
==============================================================================
--- trunk/gtk/src/socket.hg	(original)
+++ trunk/gtk/src/socket.hg	Mon Jul 14 13:15:02 2008
@@ -83,6 +83,9 @@
   _WRAP_METHOD(void add_id(Gdk::NativeWindow window_id), gtk_socket_add_id)
   _WRAP_METHOD(Gdk::NativeWindow get_id() const, gtk_socket_get_id)
 
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_plug_window(), gtk_socket_get_plug_window, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_plug_window() const, gtk_socket_get_plug_window, refreturn, constversion)
+
   _WRAP_SIGNAL(void plug_added(), "plug_added")
   _WRAP_SIGNAL(bool plug_removed(), "plug_removed")
 };

Copied: trunk/gtk/src/toolshell.hg (from r1002, /trunk/gtk/src/editable.hg)
==============================================================================
--- /trunk/gtk/src/editable.hg	(original)
+++ trunk/gtk/src/toolshell.hg	Mon Jul 14 13:15:02 2008
@@ -18,7 +18,10 @@
  */
 
 #include <glibmm/interface.h>
-#include <gtk/gtkeditable.h>
+#include <gtkmm/enums.h>
+//#include <gtk/gtktoolshell.h>
+#include <gtk/gtk.h>
+
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
@@ -26,109 +29,29 @@
 namespace Gtk
 {
 
-/** Base class for text-editing widgets.
- *
- * The Gtk::Editable class is a base class for widgets for editing text,
- * such as Gtk::Entry. It cannot be instantiated by itself. The editable
- * class contains functions for generically manipulating an editable widget,
- * a large number of action signals used for key bindings, and several
- * signals that an application can connect to to modify the behavior of a
- * widget.
+/** TODO: Documentation
  *
  */
-class Editable : public Glib::Interface
+class ToolShell : public Glib::Interface
 {
-  _CLASS_INTERFACE(Editable,GtkEditable,GTK_EDITABLE,GtkEditableClass)
+  _CLASS_INTERFACE(ToolShell, GtkToolShell, GTK_TOOL_SHELL, GtkToolShellIface)
 
 public:
-  _WRAP_METHOD(void cut_clipboard(), gtk_editable_cut_clipboard)
-  _WRAP_METHOD(void copy_clipboard(), gtk_editable_copy_clipboard)
-  _WRAP_METHOD(void paste_clipboard(), gtk_editable_paste_clipboard)
-  _WRAP_METHOD(void delete_selection(), gtk_editable_delete_selection)
-  _WRAP_METHOD(void set_editable(bool is_editable = true), gtk_editable_set_editable)
-  _WRAP_METHOD(bool get_editable() const, gtk_editable_get_editable)
-
-  _WRAP_METHOD(void insert_text(const Glib::ustring& text, int length, int& position), gtk_editable_insert_text)
-  _WRAP_METHOD(void delete_text(int start_pos, int end_pos), gtk_editable_delete_text)
-
-  _WRAP_METHOD(Glib::ustring get_chars(int start_pos, int end_pos) const, gtk_editable_get_chars)
-
-  _WRAP_METHOD(void select_region(int start_pos, int end_pos), gtk_editable_select_region)
-  _WRAP_METHOD(bool get_selection_bounds(int& start_pos, int& end_pos) const, gtk_editable_get_selection_bounds)
-
-  _WRAP_METHOD(void set_position(int position), gtk_editable_set_position)
-  _WRAP_METHOD(int get_position() const, gtk_editable_get_position)
-
-  _IGNORE_SIGNAL(insert_text)
-
-#m4begin
-dnl // WRAP_SIGNAL "insert_text"
-dnl // C++ prototype: void insert_text(const Glib::ustring& text, int* position)
-dnl // C prototype: void insert_text(const gchar* text, gint length, gint* position)
-
-  _SIGNAL_PROXY(
-      insert_text, void, `const gchar* text, gint length, gint* position',
-      insert_text, void, `const Glib::ustring&, int*',dnl // C++ prototype
-      `Glib::ustring(text, text + length), position',`dnl // C -> C++ conversion
-      /**
-       * @param const Glib::ustring& text
-       * @param int* position
-       * @return void
-       */')
-
-  _SIGNAL_H(insert_text, void, `const Glib::ustring& text, int* position')
-  _SIGNAL_PH(insert_text, void, `GtkEditable* self, const gchar* text, gint length, gint* position')
-
-  _SIGNAL_CC(
-      insert_text, insert_text, void, void,
-      `const Glib::ustring& text, int* position',dnl // C++ arguments
-      `text.data(), text.bytes(), position')dnl // C++ -> C conversion
-
-  _SIGNAL_PCC(
-      insert_text, insert_text, void, void,
-      `GtkEditable* self, const gchar* text, gint length, gint* position',dnl // C arguments
-      `self, text, length, position',dnl // C argument names
-      `Glib::ustring(text, text + length), position',dnl // C -> C++ conversion
-      self)
-#m4end
-
-  _WRAP_SIGNAL(void delete_text(int start_pos, int end_pos), "delete_text")
-  _WRAP_SIGNAL(void changed(), "changed")
+  _WRAP_METHOD(IconSize get_icon_size() const, gtk_tool_shell_get_icon_size)
+  _WRAP_METHOD(Orientation get_orientation() const, gtk_tool_shell_get_orientation)
+  _WRAP_METHOD(ToolbarStyle get_style() const, gtk_tool_shell_get_style)
+  _WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_tool_shell_get_relief_style)
+  _WRAP_METHOD(void rebuild_menu(), gtk_tool_shell_rebuild_menu)
 
+ 
 protected:
 
-#m4begin
-dnl // WRAP_VFUNC "do_insert_text"
-dnl // C++ prototype: void insert_text_vfunc(const Glib::ustring& text, int& position)
-dnl // C prototype: void do_insert_text(const gchar* text, gint length, gint* position)
-
-  _VFUNC_H(insert_text_vfunc, void, `const Glib::ustring& text, int& position')
-  _VFUNC_PH(do_insert_text, void, `GtkEditable* self, const gchar* text, gint length, gint* position')
-  _VFUNC_CC(
-      insert_text_vfunc, do_insert_text, void, void,
-      `const Glib::ustring& text, int& position',dnl // C++ arguments
-      `text.data(), text.bytes(), &position')dnl // C++ -> C conversion
-  _VFUNC_PCC(
-      insert_text_vfunc, do_insert_text, void, void,
-      `GtkEditable* self, const gchar* text, gint length, gint* position',dnl // C arguments
-      `self, text, length, position',dnl // C argument names
-      `Glib::ustring(text, text + length), *position',dnl // C -> C++ conversion
-      self)
-#m4end
-
-  _WRAP_VFUNC(void delete_text(int start_pos, int end_pos), do_delete_text)
-
-#m4begin
-dnl // This special conversion is not in convert_gtk.m4, because allocating a new
-dnl // string is rarely needed -- probably not a good idea to make this generic.
-  _CONVERSION(`Glib::ustring', `gchar*', `g_strdup(($3).c_str())')
-#m4end
-  _WRAP_VFUNC(Glib::ustring get_chars(int start_pos, int end_pos) const, get_chars)
-
-  _WRAP_VFUNC(void select_region(int start_pos, int end_pos), set_selection_bounds)
-  _WRAP_VFUNC(bool get_selection_bounds(int& start_pos, int& end_pos) const, get_selection_bounds)
-  _WRAP_VFUNC(void set_position(int position), set_position)
-  _WRAP_VFUNC(int get_position() const, get_position)
+  _WRAP_VFUNC(IconSize get_icon_size(), get_icon_size)
+  _WRAP_VFUNC(Orientation get_orientation(), get_orientation)
+  _WRAP_VFUNC(ToolbarStyle get_style(), get_style)
+  _WRAP_VFUNC(ReliefStyle get_relief_style(), get_relief_style)
+  _WRAP_VFUNC(void rebuild_menu(), rebuild_menu)
+
 };
 
 } // namespace Gtk

Modified: trunk/gtk/src/treeviewcolumn.hg
==============================================================================
--- trunk/gtk/src/treeviewcolumn.hg	(original)
+++ trunk/gtk/src/treeviewcolumn.hg	Mon Jul 14 13:15:02 2008
@@ -45,6 +45,8 @@
 
 //TODO: This should derive+implement from CellLayout when we can break ABI.
 
+class TreeView;
+
 /** Typedefed as Gtk::TreeView::Column.
  * This is a visible column in a Gtk::TreeView widget. It determines the geometry, type.
  *
@@ -228,6 +230,9 @@
   _WRAP_METHOD(bool get_cell_position(const CellRenderer& cell_renderer, int& start_pos, int& width) const, gtk_tree_view_column_cell_get_position)
   _WRAP_METHOD(void queue_resize(), gtk_tree_view_column_queue_resize)
 
+  _WRAP_METHOD(TreeView* get_tree_view(), gtk_tree_view_column_get_tree_view, refreturn)
+  _WRAP_METHOD(const TreeView* get_tree_view() const, gtk_tree_view_column_get_tree_view, refreturn, constversion)
+
   _WRAP_SIGNAL(void clicked(), "clicked")
 
   _WRAP_PROPERTY("visible", bool)

Modified: trunk/pango/pangomm-1.4.pc.in
==============================================================================
--- trunk/pango/pangomm-1.4.pc.in	(original)
+++ trunk/pango/pangomm-1.4.pc.in	Mon Jul 14 13:15:02 2008
@@ -5,7 +5,7 @@
 
 Name: Pangomm
 Description: C++ wrapper for Pango
-Requires: glibmm-2.4 pango pangocairo
+Requires: glibmm-2.4 cairomm-1.0 pango pangocairo
 Version: @VERSION@
 Libs: -L${libdir} -lpangomm-1.4
 Cflags: -I${includedir}/pangomm-1.4
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]