[gtkmm] Gdk, Gtk: Update documentation of in-class enums



commit b624c0437e010c0536860850a4e86e4828b80790
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon May 8 16:27:29 2017 +0200

    Gdk, Gtk: Update documentation of in-class enums
    
    * gdk/src/gdk_docs_override.xml:
    * gtk/src/gtk_docs_override.xml: Add and modifiy substitute_type_name and
    substitute_enumerator_name xml elements to make gmmproc correctly convert
    C names to C++ names of enums defined in a class.

 gdk/src/gdk_docs_override.xml |   38 +++++++++++++++++++++++-----------
 gtk/src/gtk_docs_override.xml |   45 +++++++++++++++++++++++++++++++----------
 2 files changed, 60 insertions(+), 23 deletions(-)
---
diff --git a/gdk/src/gdk_docs_override.xml b/gdk/src/gdk_docs_override.xml
index 5a23ae0..536adad 100644
--- a/gdk/src/gdk_docs_override.xml
+++ b/gdk/src/gdk_docs_override.xml
@@ -4,15 +4,28 @@
 <substitute_type_name from="GSettings" to="Gio::Settings" />
 <substitute_type_name from="GInputStream" to="Gio::InputStream" />
 <substitute_type_name from="GCancellable" to="Gio::Cancellable" />
-
-<substitute_enumerator_name from_prefix="GDK_TOUCH_" to_prefix="Gdk::EventType::TOUCH_" />
-<substitute_enumerator_name from_prefix="GDK_DEVICE_TYPE_" to_prefix="Gdk::DeviceType::" />
+<substitute_type_name from="GdkCursorType" to="Gdk::Cursor::Type" />
+<substitute_type_name from="GdkDeviceType" to="Gdk::Device::Type" />
+<substitute_type_name from="GdkEventType" to="Gdk::Event::Type" />
+<substitute_type_name from="GdkPixbufRotation" to="Gdk::Pixbuf::Rotation" />
+<substitute_type_name from="GdkSeatCapabilities" to="Gdk::Seat::Capabilities" />
+<substitute_type_name from="GdkWindowType" to="Gdk::Window::Type" />
+<substitute_type_name from="GdkWindowState" to="Gdk::Window::State" />
+<substitute_type_name from="GdkWindowHints" to="Gdk::Window::Hints" />
+<substitute_type_name from="GdkWindowTypeHint" to="Gdk::Window::TypeHint" />
+<substitute_type_name from="GdkVisualType" to="Gdk::Visual::Type" />
+
+<substitute_enumerator_name from_prefix="GDK_TOUCH_" to_prefix="Gdk::Event::Type::TOUCH_" />
+<substitute_enumerator_name from_prefix="GDK_DEVICE_TYPE_" to_prefix="Gdk::Device::Type::" />
 <substitute_enumerator_name from_prefix="GDK_ACTION_" to_prefix="Gdk::DragAction::" />
-<substitute_enumerator_name from_prefix="GDK_WINDOW_" to_prefix="Gdk::WindowType::" />
+<substitute_enumerator_name from_prefix="GDK_WINDOW_" to_prefix="Gdk::Window::Type::" />
+<substitute_enumerator_name from_prefix="GDK_WINDOW_STATE_" to_prefix="Gdk::Window::State::" />
+<substitute_enumerator_name from_prefix="GDK_WINDOW_TYPE_HINT_" to_prefix="Gdk::Window::TypeHint::" />
+<substitute_enumerator_name from_prefix="GDK_WINDOW_EDGE_" to_prefix="Gdk::WindowEdge::" />
 <substitute_enumerator_name from_prefix="GDK_PIXBUF_ALPHA_" to_prefix="Gdk::PixbufAlphaMode::" />
 <substitute_enumerator_name from_prefix="G_IO_ERROR_" to_prefix="Gio::Error::" />
 <substitute_enumerator_name from_prefix="GDK_INTERP_" to_prefix="Gdk::InterpType::" />
-<substitute_enumerator_name from_prefix="GDK_SEAT_CAPABILITY_" to_prefix="Gdk::SeatCapabilities::" />
+<substitute_enumerator_name from_prefix="GDK_SEAT_CAPABILITY_" to_prefix="Gdk::Seat::Capabilities::" />
 <substitute_enumerator_name from_prefix="GDK_GRAB_" to_prefix="Gdk::GrabStatus::" />
 <substitute_enumerator_name from_prefix="GDK_MODIFIER_RESERVED_" 
to_prefix="Gdk::ModifierType::MODIFIER_RESERVED_" />
 <substitute_enumerator_name from_prefix="GDK_ANCHOR_" to_prefix="Gdk::AnchorHints::" />
@@ -20,17 +33,18 @@
 <substitute_enumerator_name from_prefix="GDK_DECOR_" to_prefix="Gdk::WMDecoration::" />
 <substitute_enumerator_name from_prefix="GDK_FUNC_" to_prefix="Gdk::WMFunction::" />
 <substitute_enumerator_name from_prefix="GDK_FULLSCREEN_" to_prefix="Gdk::FullscreenMode::" />
-<substitute_enumerator_name from_prefix="GDK_VISUAL_" to_prefix="Gdk::VisualType::" />
+<substitute_enumerator_name from_prefix="GDK_VISUAL_" to_prefix="Gdk::Visual::Type::" />
 <!-- Some enums have enumerators without unique prefixes. Handle these enumerators individually. -->
 <substitute_enumerator_name from="GDK_POINTER_MOTION_HINT_MASK" 
to="Gdk::EventMask::POINTER_MOTION_HINT_MASK" />
-<substitute_enumerator_name from="GDK_MOTION_NOTIFY" to="Gdk::EventType::MOTION_NOTIFY" />
+<substitute_enumerator_name from="GDK_MOTION_NOTIFY" to="Gdk::Event::Type::MOTION_NOTIFY" />
 <substitute_enumerator_name from="GDK_POINTER_MOTION_HINT_MASK" 
to="Gdk::EventMask::POINTER_MOTION_HINT_MASK" />
 <substitute_enumerator_name from="GDK_TOUCH_MASK" to="Gdk::EventMask::TOUCH_MASK" />
-<substitute_enumerator_name from="GDK_2BUTTON_PRESS" to="Gdk::EventType::2BUTTON_PRESS" />
-<substitute_enumerator_name from="GDK_3BUTTON_PRESS" to="Gdk::EventType::3BUTTON_PRESS" />
-<substitute_enumerator_name from="GDK_DOUBLE_BUTTON_PRESS" to="Gdk::EventType::DOUBLE_BUTTON_PRESS" />
-<substitute_enumerator_name from="GDK_TRIPLE_BUTTON_PRESS" to="Gdk::EventType::TRIPLE_BUTTON_PRESS" />
-<substitute_enumerator_name from="GDK_BUTTON_PRESS" to="Gdk::EventType::BUTTON_PRESS" />
+<substitute_enumerator_name from="GDK_2BUTTON_PRESS" to="Gdk::Event::Type::2BUTTON_PRESS" />
+<substitute_enumerator_name from="GDK_3BUTTON_PRESS" to="Gdk::Event::Type::3BUTTON_PRESS" />
+<substitute_enumerator_name from="GDK_DOUBLE_BUTTON_PRESS" to="Gdk::Event::Type::DOUBLE_BUTTON_PRESS" />
+<substitute_enumerator_name from="GDK_TRIPLE_BUTTON_PRESS" to="Gdk::Event::Type::TRIPLE_BUTTON_PRESS" />
+<substitute_enumerator_name from="GDK_BUTTON_PRESS" to="Gdk::Event::Type::BUTTON_PRESS" />
+<substitute_enumerator_name from="GDK_WINDOW_STATE" to="Gdk::Event::Type::WINDOW_STATE" />
 <substitute_enumerator_name from="GDK_BUTTON_PRESS_MASK" to="Gdk::EventMask::BUTTON_PRESS_MASK" />
 <substitute_enumerator_name from="GDK_SUPER_MASK" to="Gdk::ModifierType::SUPER_MASK" />
 <substitute_enumerator_name from="GDK_HYPER_MASK" to="Gdk::ModifierType::HYPER_MASK" />
@@ -40,7 +54,7 @@
 <substitute_enumerator_name from="GDK_BUTTON5_MASK" to="Gdk::ModifierType::BUTTON5_MASK" />
 <substitute_enumerator_name from="GDK_CONTROL_MASK" to="Gdk::ModifierType::CONTROL_MASK" />
 <substitute_enumerator_name from="GDK_MOD2_MASK" to="Gdk::ModifierType::MOD2_MASK" />
-<substitute_enumerator_name from="GDK_BLANK_CURSOR" to="Gdk::CursorType::BLANK_CURSOR" />
+<substitute_enumerator_name from="GDK_BLANK_CURSOR" to="Gdk::Cursor::Type::BLANK_CURSOR" />
 <!-- These are preprocessor defines. Don't substitute. -->
 <substitute_enumerator_name from="GDK_NONE" to="GDK_NONE" />
 <substitute_enumerator_name from="GDK_CURRENT_TIME" to="GDK_CURRENT_TIME" />
diff --git a/gtk/src/gtk_docs_override.xml b/gtk/src/gtk_docs_override.xml
index 3372c95..7fde04b 100644
--- a/gtk/src/gtk_docs_override.xml
+++ b/gtk/src/gtk_docs_override.xml
@@ -22,9 +22,32 @@
 <substitute_type_name from="GMountOperation" to="Gio::MountOperation" />
 <substitute_type_name from="GFileError" to="Glib::FileError" />
 <substitute_type_name from="GKeyFileError" to="Glib::KeyFileError" />
+<substitute_type_name from="GtkApplicationInhibitFlags" to="Gtk::Application::InhibitFlags" />
+<substitute_type_name from="GtkAssistantPageType" to="Gtk::Assistant::PageType" />
+<substitute_type_name from="GtkCalendarDisplayOptions" to="Gtk::Calendar::DisplayOptions" />
+<substitute_type_name from="GtkCellRendererAccelMode" to="Gtk::CellRendererAccel::Mode" />
+<substitute_type_name from="GtkCssSectionType" to="Gtk::CssSection::Type" />
+<substitute_type_name from="GtkEntryIconPosition" to="Gtk::Entry::IconPosition" />
+<substitute_type_name from="GtkFileChooserAction" to="Gtk::FileChooser::Action" />
+<substitute_type_name from="GtkFileChooserConfirmation" to="Gtk::FileChooser::Confirmation" />
+<substitute_type_name from="GtkFileFilterFlags" to="Gtk::FileFilter::Flags" />
+<substitute_type_name from="GtkIconViewDropPosition" to="Gtk::IconView::DropPosition" />
+<substitute_type_name from="GtkImageType" to="Gtk::Image::Type" />
+<substitute_type_name from="GtkLevelBarMode" to="Gtk::LevelBar::Mode" />
+<substitute_type_name from="GtkPopoverConstraint" to="Gtk::Popover::Constraint" />
+<substitute_type_name from="GtkPrintOperationAction" to="Gtk::PrintOperation::Action" />
+<substitute_type_name from="GtkPrintOperationResult" to="Gtk::PrintOperation::Result" />
+<substitute_type_name from="GtkRecentFilterFlags" to="Gtk::RecentFilter::Flags" />
+<substitute_type_name from="GtkScrollablePolicy" to="Gtk::Scrollable::Policy" />
+<substitute_type_name from="GtkSizeGroupMode" to="Gtk::SizeGroup::Mode" />
+<substitute_type_name from="GtkSpinButtonUpdatePolicy" to="Gtk::SpinButton::UpdatePolicy" />
+<substitute_type_name from="GtkTreeModelFlags" to="Gtk::TreeModel::Flags" />
+<substitute_type_name from="GtkTreeViewColumnSizing" to="Gtk::TreeViewColumn::Sizing" />
+<substitute_type_name from="GtkTreeViewDropPosition" to="Gtk::TreeView::DropPosition" />
+<substitute_type_name from="GtkTreeViewGridLines" to="Gtk::TreeView::GridLines" />
 
 <substitute_enumerator_name from_prefix="GTK_LICENSE_" to_prefix="Gtk::License::" />
-<substitute_enumerator_name from_prefix="GTK_ASSISTANT_PAGE_" to_prefix="Gtk::AssistantPageType::" />
+<substitute_enumerator_name from_prefix="GTK_ASSISTANT_PAGE_" to_prefix="Gtk::Assistant::PageType::" />
 <substitute_enumerator_name from_prefix="GTK_PACK_" to_prefix="Gtk::PackType::" />
 <substitute_enumerator_name from_prefix="GTK_PACK_DIRECTION_" to_prefix="Gtk::PackDirection::" />
 <substitute_enumerator_name from_prefix="GTK_RELIEF_" to_prefix="Gtk::ReliefStyle::" />
@@ -33,17 +56,17 @@
 <substitute_enumerator_name from_prefix="GTK_CELL_RENDERER_MODE_" to_prefix="Gtk::CellRendererMode::" />
 <substitute_enumerator_name from_prefix="PANGO_ELLIPSIZE_" to_prefix="Pango::EllipsizeMode::" />
 <substitute_enumerator_name from_prefix="GTK_SENSITIVITY_" to_prefix="Gtk::SensitivityType::" />
-<substitute_enumerator_name from_prefix="GTK_CSS_SECTION_" to_prefix="Gtk::CssSectionType::" />
+<substitute_enumerator_name from_prefix="GTK_CSS_SECTION_" to_prefix="Gtk::CssSection::Type::" />
 <substitute_enumerator_name from_prefix="GTK_RESPONSE_" to_prefix="Gtk::ResponseType::" />
 <substitute_enumerator_name from_prefix="GTK_INPUT_PURPOSE_" to_prefix="Gtk::InputPurpose::" />
-<substitute_enumerator_name from_prefix="GTK_IMAGE_" to_prefix="Gtk::ImageType::" />
+<substitute_enumerator_name from_prefix="GTK_IMAGE_" to_prefix="Gtk::Image::Type::" />
 <substitute_enumerator_name from_prefix="GTK_PLACES_OPEN_" to_prefix="Gtk::PlacesOpenFlags::" />
 <substitute_enumerator_name from_prefix="GTK_SELECTION_" to_prefix="Gtk::SelectionMode::" />
 <substitute_enumerator_name from_prefix="GTK_WIN_POS_" to_prefix="Gtk::WindowPosition::" />
 <substitute_enumerator_name from_prefix="GTK_WINDOW_" to_prefix="Gtk::WindowType::" />
 <substitute_enumerator_name from_prefix="GTK_PHASE_" to_prefix="Gtk::PropagationPhase::" />
-<substitute_enumerator_name from_prefix="GTK_FILE_CHOOSER_ACTION_" to_prefix="Gtk::FileChooserAction::" />
-<substitute_enumerator_name from_prefix="GTK_FILE_CHOOSER_CONFIRMATION_" 
to_prefix="Gtk::FileChooserConfirmation::" />
+<substitute_enumerator_name from_prefix="GTK_FILE_CHOOSER_ACTION_" to_prefix="Gtk::FileChooser::Action::" />
+<substitute_enumerator_name from_prefix="GTK_FILE_CHOOSER_CONFIRMATION_" 
to_prefix="Gtk::FileChooser::Confirmation::" />
 <substitute_enumerator_name from_prefix="GTK_EVENT_SEQUENCE_" to_prefix="Gtk::EventSequenceState::" />
 <substitute_enumerator_name from_prefix="GTK_POS_" to_prefix="Gtk::PositionType::" />
 <substitute_enumerator_name from_prefix="GTK_BASELINE_POSITION_" to_prefix="Gtk::BaselinePosition::" />
@@ -51,7 +74,7 @@
 <substitute_enumerator_name from_prefix="GTK_JUSTIFY_" to_prefix="Gtk::Justification::" />
 <substitute_enumerator_name from_prefix="PANGO_WRAP_" to_prefix="Pango::WrapMode::" />
 <substitute_enumerator_name from_prefix="GTK_STATE_FLAG_" to_prefix="Gtk::StateFlags::" />
-<substitute_enumerator_name from_prefix="GTK_LEVEL_BAR_MODE_" to_prefix="Gtk::LevelBarMode::" />
+<substitute_enumerator_name from_prefix="GTK_LEVEL_BAR_MODE_" to_prefix="Gtk::LevelBar::Mode::" />
 <substitute_enumerator_name from_prefix="GDK_ANCHOR_" to_prefix="Gdk::AnchorHints::" />
 <substitute_enumerator_name from_prefix="GDK_GRAVITY_" to_prefix="Gdk::Gravity::" />
 <substitute_enumerator_name from_prefix="GTK_ARROW_" to_prefix="Gtk::ArrowType::" />
@@ -59,26 +82,26 @@
 <substitute_enumerator_name from_prefix="GTK_ALIGN_" to_prefix="Gtk::Align::" />
 <substitute_enumerator_name from_prefix="GTK_UNIT_" to_prefix="Gtk::Unit::" />
 <substitute_enumerator_name from_prefix="GDK_ACTION_" to_prefix="Gdk::DragAction::" />
-<substitute_enumerator_name from_prefix="GTK_PRINT_OPERATION_RESULT_" 
to_prefix="Gtk::PrintOperationResult::" />
+<substitute_enumerator_name from_prefix="GTK_PRINT_OPERATION_RESULT_" 
to_prefix="Gtk::PrintOperation::Result::" />
 <substitute_enumerator_name from_prefix="GTK_PRINT_STATUS_" to_prefix="Gtk::PrintStatus::" />
 <substitute_enumerator_name from_prefix="GTK_TEXT_DIR_" to_prefix="Gtk::TextDirection::" />
 <substitute_enumerator_name from_prefix="GTK_POLICY_" to_prefix="Gtk::PolicyType::" />
 <substitute_enumerator_name from_prefix="GTK_CORNER_" to_prefix="Gtk::CornerType::" />
 <substitute_enumerator_name from_prefix="GDK_SOURCE_" to_prefix="Gdk::InputSource::" />
 <substitute_enumerator_name from_prefix="GTK_SHORTCUT_" to_prefix="Gtk::ShortcutType::" />
-<substitute_enumerator_name from_prefix="GTK_SIZE_GROUP_" to_prefix="Gtk::SizeGroupMopde::" />
+<substitute_enumerator_name from_prefix="GTK_SIZE_GROUP_" to_prefix="Gtk::SizeGroup::Mode::" />
 <substitute_enumerator_name from_prefix="GTK_TEXT_SEARCH_" to_prefix="Gtk::TextSearchFlags::" />
 <substitute_enumerator_name from_prefix="PANGO_UNDERLINE_" to_prefix="Pango::Underline::" />
 <substitute_enumerator_name from_prefix="GTK_TEXT_WINDOW_" to_prefix="Gtk::TextWindowType::" />
 <substitute_enumerator_name from_prefix="GTK_TOOLBAR_" to_prefix="Gtk::ToolbarStyle::" />
-<substitute_enumerator_name from_prefix="GTK_TREE_MODEL_" to_prefix="Gtk::TreeModelFlags::" />
-<substitute_enumerator_name from_prefix="GTK_TREE_VIEW_COLUMN_" to_prefix="Gtk::TreeViewColumnSizing::" />
+<substitute_enumerator_name from_prefix="GTK_TREE_MODEL_" to_prefix="Gtk::TreeModel::Flags::" />
+<substitute_enumerator_name from_prefix="GTK_TREE_VIEW_COLUMN_" to_prefix="Gtk::TreeViewColumn::Sizing::" />
 <substitute_enumerator_name from_prefix="GTK_ORIENTATION_" to_prefix="Gtk::Orientation::" />
 <substitute_enumerator_name from_prefix="GTK_ACCEL_" to_prefix="Gtk::AccelFlags::" />
 <substitute_enumerator_name from_prefix="GTK_DIR_" to_prefix="Gtk::DirectionType::" />
 <substitute_enumerator_name from_prefix="GTK_DEST_DEFAULT_" to_prefix="Gtk::DestDefaults::" />
 <substitute_enumerator_name from_prefix="GTK_PRINT_CAPABILITY_" to_prefix="Gtk::PrintCapabilities::" />
-<substitute_enumerator_name from_prefix="GTK_PRINT_OPERATION_ACTION_" 
to_prefix="Gtk::PrintOperationAction::" />
+<substitute_enumerator_name from_prefix="GTK_PRINT_OPERATION_ACTION_" 
to_prefix="Gtk::PrintOperation::Action::" />
 <!-- GdkWindowWindowClass is not wrapped in gtkmm. Don't substitute its enumerator names. -->
 <substitute_enumerator_name from="GDK_INPUT_ONLY" to="GDK_INPUT_ONLY" />
 <substitute_enumerator_name from="GDK_INPUT_OUTPUT" to="GDK_INPUT_OUTPUT" />


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