gtkmm r1112 - in trunk: . MSVC_Net2005 gtk/src win32_installer

[daniel svn gnome org]

Author: daniel
Date: Tue Mar 10 14:46:43 2009
New Revision: 1112
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1112&view=rev

Log:
[merge from branches/gtkmm-2-12]

* gtk/src/textbuffer.{ccg,hg} (TextBuffer::[gs]et_rich_text_format):
Remove Maemo-specific methods which have been superseded by the
generic TextBuffer serialization facilities.
(TextBuffer::set_rich_text_format_all): ditto,
(TextBuffer::[gs]et_can_paste_rich_text): ditto.

* gtk/src/enums.hg (Gtk::Hildon::SizeType): New Maemo-specific
enumeration corresponding to HildonSizeType.
(Gtk::Hildon::InputMode): New Maemo-specific enumeration
corresponding to HildonGtkInputMode.

* gtk/src/gtk_enums_maemo.defs: New separate defs file for the
changes in the Maemo fork of GTK+.
* gtk/src/gtk_methods_maemo.defs: Likewise.
* gtk/src/gtk.defs: Include the Maemo defs files.
* gtk/src/Makefile.am (files_defs): Add the new defs files.


Added:
   trunk/gtk/src/gtk_enums_maemo.defs
      - copied unchanged from r1108, /branches/gtkmm-2-12/gtk/src/gtk_enums_maemo.defs
Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/MSVC_Net2005/   (props changed)
   trunk/gtk/src/Makefile.am
   trunk/gtk/src/activatable.ccg   (props changed)
   trunk/gtk/src/activatable.hg   (props changed)
   trunk/gtk/src/enums.hg
   trunk/gtk/src/gtk.defs
   trunk/gtk/src/gtk_methods_maemo.defs
   trunk/gtk/src/orientable.ccg   (props changed)
   trunk/gtk/src/orientable.hg   (props changed)
   trunk/gtk/src/textbuffer.ccg
   trunk/gtk/src/textbuffer.hg
   trunk/win32_installer/   (props changed)
   trunk/win32_installer/gtkmm-vc80-2_4.vsprops   (props changed)
   trunk/win32_installer/gtkmm-vc80-d-2_4.vsprops   (props changed)

Modified: trunk/gtk/src/Makefile.am
==============================================================================
--- trunk/gtk/src/Makefile.am	(original)
+++ trunk/gtk/src/Makefile.am	Tue Mar 10 14:46:43 2009
@@ -4,8 +4,8 @@
 sublib_name = gtkmm
 sublib_namespace = Gtk
 sublib_parentdir = gtkmm
-files_defs = gtk.defs gtk_methods.defs gtk_methods_maemo.defs gtk_signals.defs gtk_vfuncs.defs gtk_other.defs gtk_enums.defs \
-             gtk_docs.xml gtk_docs_override.xml
+files_defs = gtk.defs gtk_methods.defs gtk_methods_maemo.defs gtk_signals.defs \
+	gtk_vfuncs.defs gtk_other.defs gtk_enums.defs gtk_enums_maemo.defs \
+	gtk_docs.xml gtk_docs_override.xml
 
 include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
-

Modified: trunk/gtk/src/enums.hg
==============================================================================
--- trunk/gtk/src/enums.hg	(original)
+++ trunk/gtk/src/enums.hg	Tue Mar 10 14:46:43 2009
@@ -100,6 +100,18 @@
 _WRAP_ENUM(SensitivityType, GtkSensitivityType)
 
 
+#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
+namespace Hildon
+{
+
+#m4 dnl // TODO: Get the get_type stuff to work
+_WRAP_ENUM(SizeType, HildonSizeType, NO_GTYPE)
+_WRAP_ENUM(InputMode, HildonGtkInputMode, s#^GTK_##, NO_GTYPE)
+
+} // namespace Hildon
+#endif /* GTKMM_MAEMO_EXTENSIONS_ENABLED */
+
+
 /* We use a class to implement the GtkIconSize enum, because you can register
  * new "enum" values.  The strict type rules of C++ don't allow using an enum
  * like that.  Gtk::BuiltinIconSize is the actual GtkIconSize wrapper enum.

Modified: trunk/gtk/src/gtk.defs
==============================================================================
--- trunk/gtk/src/gtk.defs	(original)
+++ trunk/gtk/src/gtk.defs	Tue Mar 10 14:46:43 2009
@@ -3,5 +3,5 @@
 (include gtk_signals.defs)
 (include gtk_vfuncs.defs)
 (include gtk_enums.defs)
+(include gtk_enums_maemo.defs)
 (include gtk_other.defs)
-

Modified: trunk/gtk/src/gtk_methods_maemo.defs
==============================================================================
--- trunk/gtk/src/gtk_methods_maemo.defs	(original)
+++ trunk/gtk/src/gtk_methods_maemo.defs	Tue Mar 10 14:46:43 2009
@@ -1,33 +1,265 @@
+;; -*- scheme -*-
 ;; These functions are only available on the Maemo platform (patched Gtk+).
-;; So they are surrounded by ifdefs in the gtkmm source code.
+;; So they are surrounded by #ifdefs in the gtkmm source code.
 
-(define-method set_can_paste_rich_text
-  (of-object "GtkTextBuffer")
-  (c-name "gtk_text_buffer_set_can_paste_rich_text")
+(define-flags GtkInputMode
+  (in-module "Hildon")
+  (c-name "HildonGtkInputMode")
+  (gtype-id "HILDON_TYPE_GTK_INPUT_MODE")
+  (values
+    '("alpha" "HILDON_GTK_INPUT_MODE_ALPHA")
+    '("numeric" "HILDON_GTK_INPUT_MODE_NUMERIC")
+    '("special" "HILDON_GTK_INPUT_MODE_SPECIAL")
+    '("hexa" "HILDON_GTK_INPUT_MODE_HEXA")
+    '("tele" "HILDON_GTK_INPUT_MODE_TELE")
+    '("full" "HILDON_GTK_INPUT_MODE_FULL")
+    '("multiline" "HILDON_GTK_INPUT_MODE_MULTILINE")
+    '("invisible" "HILDON_GTK_INPUT_MODE_INVISIBLE")
+    '("autocap" "HILDON_GTK_INPUT_MODE_AUTOCAP")
+    '("dictionary" "HILDON_GTK_INPUT_MODE_DICTIONARY")
+  )
+)
+
+(define-enum Mode
+  (in-module "Hildon")
+  (c-name "HildonMode")
+  (gtype-id "HILDON_TYPE_MODE")
+  (values
+    '("diablo" "HILDON_DIABLO")
+    '("fremantle" "HILDON_FREMANTLE")
+  )
+)
+
+(define-enum UIMode
+  (in-module "Hildon")
+  (c-name "HildonUIMode")
+  (gtype-id "HILDON_TYPE_UI_MODE")
+  (values
+    '("normal" "HILDON_UI_MODE_NORMAL")
+    '("edit" "HILDON_UI_MODE_EDIT")
+  )
+)
+
+(define-flags SizeType
+  (in-module "Hildon")
+  (c-name "HildonSizeType")
+  (gtype-id "HILDON_TYPE_SIZE_TYPE")
+  (values
+    '("auto-width" "HILDON_SIZE_AUTO_WIDTH")
+    '("halfscreen-width" "HILDON_SIZE_HALFSCREEN_WIDTH")
+    '("fullscreen-width" "HILDON_SIZE_FULLSCREEN_WIDTH")
+    '("auto-height" "HILDON_SIZE_AUTO_HEIGHT")
+    '("finger-height" "HILDON_SIZE_FINGER_HEIGHT")
+    '("thumb-height" "HILDON_SIZE_THUMB_HEIGHT")
+    '("auto" "HILDON_SIZE_AUTO")
+  )
+)
+
+(define-function hildon_gtk_entry_set_input_mode
+  (c-name "hildon_gtk_entry_set_input_mode")
+  (return-type "none")
+  (parameters
+    '("GtkEntry*" "entry")
+    '("HildonGtkInputMode" "input_mode")
+  )
+)
+
+(define-function hildon_gtk_entry_get_input_mode
+  (c-name "hildon_gtk_entry_get_input_mode")
+  (return-type "HildonGtkInputMode")
+  (parameters
+    '("GtkEntry*" "entry")
+  )
+)
+
+(define-function hildon_gtk_entry_set_progress_adjustment
+  (c-name "hildon_gtk_entry_set_progress_adjustment")
+  (return-type "none")
+  (parameters
+    '("GtkEntry*" "entry")
+    '("GtkAdjustment*" "adjustment")
+  )
+)
+
+(define-function hildon_gtk_file_chooser_install_properties
+  (c-name "hildon_gtk_file_chooser_install_properties")
+  (return-type "none")
+  (parameters
+    '("GObjectClass*" "klass")
+  )
+)
+
+(define-function hildon_icon_view_get_row_header_func
+  (c-name "hildon_icon_view_get_row_header_func")
+  (return-type "HildonIconViewRowHeaderFunc")
+  (parameters
+    '("GtkIconView*" "icon_view")
+  )
+)
+
+(define-function hildon_icon_view_set_row_header_func
+  (c-name "hildon_icon_view_set_row_header_func")
+  (return-type "none")
+  (parameters
+    '("GtkIconView*" "icon_view")
+    '("HildonIconViewRowHeaderFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
+  )
+)
+
+(define-function hildon_icon_view_get_hildon_ui_mode
+  (c-name "hildon_icon_view_get_hildon_ui_mode")
+  (return-type "HildonUIMode")
+  (parameters
+    '("GtkIconView*" "icon_view")
+  )
+)
+
+(define-function hildon_icon_view_set_hildon_ui_mode
+  (c-name "hildon_icon_view_set_hildon_ui_mode")
+  (return-type "none")
+  (parameters
+    '("GtkIconView*" "icon_view")
+    '("HildonUIMode" "mode")
+  )
+)
+
+(define-function hildon_gtk_im_context_filter_event
+  (c-name "hildon_gtk_im_context_filter_event")
+  (return-type "gboolean")
+  (parameters
+    '("GtkIMContext*" "context")
+    '("GdkEvent*" "event")
+  )
+)
+
+(define-function hildon_gtk_im_context_show
+  (c-name "hildon_gtk_im_context_show")
   (return-type "none")
   (parameters
-    '("gboolean" "can_paste_rich_text")
+    '("GtkIMContext*" "context")
   )
 )
 
-(define-method get_can_paste_rich_text
-  (of-object "GtkTextBuffer")
-  (c-name "gtk_text_buffer_get_can_paste_rich_text")
+(define-function hildon_gtk_im_context_hide
+  (c-name "hildon_gtk_im_context_hide")
+  (return-type "none")
+  (parameters
+    '("GtkIMContext*" "context")
+  )
+)
+
+(define-function hildon_gtk_im_context_has_selection
+  (c-name "hildon_gtk_im_context_has_selection")
   (return-type "gboolean")
+  (parameters
+    '("GtkIMContext*" "context")
+  )
+)
+
+(define-function hildon_gtk_im_context_copy
+  (c-name "hildon_gtk_im_context_copy")
+  (return-type "none")
+  (parameters
+    '("GtkIMContext*" "context")
+  )
+)
+
+(define-function hildon_gtk_im_context_cut
+  (c-name "hildon_gtk_im_context_cut")
+  (return-type "none")
+  (parameters
+    '("GtkIMContext*" "context")
+  )
+)
+
+(define-function hildon_gtk_im_context_paste
+  (c-name "hildon_gtk_im_context_paste")
+  (return-type "none")
+  (parameters
+    '("GtkIMContext*" "context")
+  )
+)
+
+(define-function hildon_gtk_text_view_set_input_mode
+  (c-name "hildon_gtk_text_view_set_input_mode")
+  (return-type "none")
+  (parameters
+    '("GtkTextView*" "text_view")
+    '("HildonGtkInputMode" "mode")
+  )
 )
 
-(define-method set_rich_text_format
-  (of-object "GtkTextBuffer")
-  (c-name "gtk_text_buffer_set_rich_text_format")
+(define-function hildon_gtk_text_view_get_input_mode
+  (c-name "hildon_gtk_text_view_get_input_mode")
+  (return-type "HildonGtkInputMode")
+  (parameters
+    '("GtkTextView*" "text_view")
+  )
+)
+
+(define-function hildon_tree_view_get_row_header_func
+  (c-name "hildon_tree_view_get_row_header_func")
+  (return-type "HildonTreeViewRowHeaderFunc")
+  (parameters
+    '("GtkTreeView*" "tree_view")
+  )
+)
+
+(define-function hildon_tree_view_set_row_header_func
+  (c-name "hildon_tree_view_set_row_header_func")
   (return-type "none")
   (parameters
-    '("const-gchar*" "format")
+    '("GtkTreeView*" "tree_view")
+    '("HildonTreeViewRowHeaderFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
   )
 )
 
-(define-method get_rich_text_format
-  (of-object "GtkTextBuffer")
-  (c-name "gtk_text_buffer_get_rich_text_format")
-  (return-type "const-gchar*")
+(define-function hildon_tree_view_get_hildon_ui_mode
+  (c-name "hildon_tree_view_get_hildon_ui_mode")
+  (return-type "HildonUIMode")
+  (parameters
+    '("GtkTreeView*" "tree_view")
+  )
 )
 
+(define-function hildon_tree_view_set_hildon_ui_mode
+  (c-name "hildon_tree_view_set_hildon_ui_mode")
+  (return-type "none")
+  (parameters
+    '("GtkTreeView*" "tree_view")
+    '("HildonUIMode" "mode")
+  )
+)
+
+(define-function hildon_gtk_input_mode_get_type
+  (c-name "hildon_gtk_input_mode_get_type")
+  (return-type "GType")
+)
+
+(define-function hildon_mode_get_type
+  (c-name "hildon_mode_get_type")
+  (return-type "GType")
+)
+
+(define-function hildon_ui_mode_get_type
+  (c-name "hildon_ui_mode_get_type")
+  (return-type "GType")
+)
+
+(define-function hildon_size_type_get_type
+  (c-name "hildon_size_type_get_type")
+  (return-type "GType")
+)
+
+(define-function hildon_gtk_widget_set_theme_size
+  (c-name "hildon_gtk_widget_set_theme_size")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("HildonSizeType" "size")
+  )
+)

Modified: trunk/gtk/src/textbuffer.ccg
==============================================================================
--- trunk/gtk/src/textbuffer.ccg	(original)
+++ trunk/gtk/src/textbuffer.ccg	Tue Mar 10 14:46:43 2009
@@ -588,12 +588,4 @@
 }
 */
 
-#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
-void TextBuffer::set_rich_text_format_all()
-{
-  gtk_text_buffer_set_rich_text_format(gobj(), NULL);
-}
-#endif //GTKMM_MAEMO_EXTENSIONS_ENABLED
-
 } // namespace Gtk
-

Modified: trunk/gtk/src/textbuffer.hg
==============================================================================
--- trunk/gtk/src/textbuffer.hg	(original)
+++ trunk/gtk/src/textbuffer.hg	Tue Mar 10 14:46:43 2009
@@ -489,26 +489,6 @@
   //_WRAP_METHOD(GtkTargetList * gtk_text_buffer_get_copy_target_list() const, gtk_text_buffer_get_copy_target_list)
   //_WRAP_METHOD(GtkTargetList * gtk_text_buffer_get_paste_target_list() const, gtk_text_buffer_get_paste_target_list)
 
-
-
-  //These are only available on the Maemo platform (patched Gtk+):
-
-  _WRAP_METHOD(void set_can_paste_rich_text(bool can_paste_rich_text), gtk_text_buffer_set_can_paste_rich_text, ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED)
-  _WRAP_METHOD(bool get_can_paste_rich_text() const, gtk_text_buffer_get_can_paste_rich_text, ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED)
-
-  _WRAP_METHOD(void set_rich_text_format(const Glib::ustring& format), gtk_text_buffer_set_rich_text_format, ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED)
-
-#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
-  /** Accept all formats from clipboard
-   *
-   */
-  void set_rich_text_format_all();
-#endif //GTKMM_MAEMO_EXTENSIONS_ENABLED
-
-  _WRAP_METHOD(Glib::ustring get_rich_text_format() const, gtk_text_buffer_get_rich_text_format, ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED) 
-
-
-
 //TODO: I have commented these out for now because I don't understand what the register_buffer and content_buffer are. murrayc.
  //TODO: Documentation.
  // typedef sigc::slot<guint8*, const Glib::RefPtr<TextBuffer>& /* content_buffer */, const iterator& /* start */, const iterator& /* end */, gsize& /* length */> SlotSerialize;