gtkmm r1035 - in trunk: . gtk/src

[murrayc svn gnome org]

Author: murrayc
Date: Wed Sep  3 12:45:26 2008
New Revision: 1035
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1035&view=rev

Log:
2008-09-03  Murray Cumming  <murrayc murrayc com>

* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
* gtk/src/selectiondata.ccg:
* gtk/src/selectiondata.hg: Changed get_data() to not return a length too,
and added get_length(), to fix the build after GTK+ changes. This gtkmm 
API is now just like it was in gtkmm 2.12.
* gtk/src/widget.hg: Changed the get_allocation() implementation back to 
direct struct field access with _GET_MEMBER() because GTK+ has removed 
the new gtk_widget_get_allocation() function.

Modified:
   trunk/ChangeLog
   trunk/gtk/src/gtk_methods.defs
   trunk/gtk/src/selectiondata.ccg
   trunk/gtk/src/selectiondata.hg
   trunk/gtk/src/widget.hg

Modified: trunk/gtk/src/gtk_methods.defs
==============================================================================
--- trunk/gtk/src/gtk_methods.defs	(original)
+++ trunk/gtk/src/gtk_methods.defs	Wed Sep  3 12:45:26 2008
@@ -2171,6 +2171,22 @@
   )
 )
 
+(define-enum NumberUpLayout
+  (in-module "Gtk")
+  (c-name "GtkNumberUpLayout")
+  (gtype-id "GTK_TYPE_NUMBER_UP_LAYOUT")
+  (values
+    '("left-to-right-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM")
+    '("left-to-right-bottom-to-top" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP")
+    '("right-to-left-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM")
+    '("right-to-left-bottom-to-top" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP")
+    '("top-to-bottom-left-to-right" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT")
+    '("top-to-bottom-right-to-left" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT")
+    '("bottom-to-top-left-to-right" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT")
+    '("bottom-to-top-right-to-left" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT")
+  )
+)
+
 (define-enum PageOrientation
   (in-module "Gtk")
   (c-name "GtkPageOrientation")
@@ -2505,6 +2521,7 @@
     '("generate-ps" "GTK_PRINT_CAPABILITY_GENERATE_PS")
     '("preview" "GTK_PRINT_CAPABILITY_PREVIEW")
     '("number-up" "GTK_PRINT_CAPABILITY_NUMBER_UP")
+    '("number-up-layout" "GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT")
   )
 )
 
@@ -18522,6 +18539,21 @@
   )
 )
 
+(define-method get_number_up_layout
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_get_number_up_layout")
+  (return-type "GtkNumberUpLayout")
+)
+
+(define-method set_number_up_layout
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_set_number_up_layout")
+  (return-type "none")
+  (parameters
+    '("GtkNumberUpLayout" "number_up_layout")
+  )
+)
+
 (define-method get_resolution
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_resolution")
@@ -21150,9 +21182,12 @@
   (of-object "GtkSelectionData")
   (c-name "gtk_selection_data_get_data")
   (return-type "const-guchar*")
-  (parameters
-    '("guint*" "length")
-  )
+)
+
+(define-method get_length
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_length")
+  (return-type "gint")
 )
 
 (define-method get_display
@@ -30422,6 +30457,11 @@
   (return-type "GType")
 )
 
+(define-function gtk_number_up_layout_get_type
+  (c-name "gtk_number_up_layout_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_page_orientation_get_type
   (c-name "gtk_page_orientation_get_type")
   (return-type "GType")
@@ -31592,6 +31632,12 @@
   )
 )
 
+(define-method get_parent
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_parent")
+  (return-type "GtkWidget*")
+)
+
 (define-method set_parent_window
   (of-object "GtkWidget")
   (c-name "gtk_widget_set_parent_window")
@@ -31601,6 +31647,12 @@
   )
 )
 
+(define-method get_parent_window
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_parent_window")
+  (return-type "GdkWindow*")
+)
+
 (define-method set_child_visible
   (of-object "GtkWidget")
   (c-name "gtk_widget_set_child_visible")
@@ -31616,30 +31668,12 @@
   (return-type "gboolean")
 )
 
-(define-method get_allocation
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_allocation")
-  (return-type "GtkAllocation")
-)
-
 (define-method get_window
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_window")
   (return-type "GdkWindow*")
 )
 
-(define-method get_parent
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_parent")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_parent_window
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_parent_window")
-  (return-type "GdkWindow*")
-)
-
 (define-method child_focus
   (of-object "GtkWidget")
   (c-name "gtk_widget_child_focus")

Modified: trunk/gtk/src/selectiondata.ccg
==============================================================================
--- trunk/gtk/src/selectiondata.ccg	(original)
+++ trunk/gtk/src/selectiondata.ccg	Wed Sep  3 12:45:26 2008
@@ -90,18 +90,6 @@
     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	Wed Sep  3 12:45:26 2008
@@ -86,15 +86,8 @@
   _WRAP_METHOD(Glib::StringArrayHandle get_uris() const, gtk_selection_data_get_uris)
 
 
-  _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
+  _WRAP_METHOD(const guchar* get_data() const, gtk_selection_data_get_data)
+  _WRAP_METHOD(int get_length() const, gtk_selection_data_get_length)
 
   std::string get_data_as_string() const;
 

Modified: trunk/gtk/src/widget.hg
==============================================================================
--- trunk/gtk/src/widget.hg	(original)
+++ trunk/gtk/src/widget.hg	Wed Sep  3 12:45:26 2008
@@ -226,9 +226,6 @@
   _WRAP_METHOD(void set_child_visible(bool is_visible = true), gtk_widget_set_child_visible)
   _WRAP_METHOD(bool get_child_visible() const, gtk_widget_get_child_visible)
 
-#m4  _CONVERSION(`GtkAllocation',`Allocation',`($2)(Glib::wrap(&($3)))')
-  _WRAP_METHOD(Allocation get_allocation() const, gtk_widget_get_allocation)
-
   _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_window(), gtk_widget_get_window, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_window() const, gtk_widget_get_window, refreturn, constversion)
 
@@ -615,6 +612,9 @@
   _MEMBER_GET(saved_state, saved_state, Gtk::StateType, guint8)
   _MEMBER_GET(requisition, requisition, Requisition, GtkRequisition)
 
+#m4  _CONVERSION(`GtkAllocation',`Allocation',`($2)(Glib::wrap(&($3)))')
+  _MEMBER_GET(allocation, allocation, Allocation, GtkAllocation)
+
 
   _WRAP_SIGNAL(void show(),"show")
   _WRAP_SIGNAL(void hide(),"hide")