[gtkmm-documentation] Examples: Fix make check when _WRAP_ENUM generates enum class
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation] Examples: Fix make check when _WRAP_ENUM generates enum class
- Date: Thu, 13 Apr 2017 14:34:31 +0000 (UTC)
commit 9f67238e3068027607dc19b7838b5fe6be7895b0
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Thu Apr 13 16:32:14 2017 +0200
Examples: Fix make check when _WRAP_ENUM generates enum class
Bug 86864
examples/book/actionbar/examplewindow.cc | 12 ++++----
.../command_line_handling/exampleapplication.cc | 2 +-
.../book/application/simple/exampleapplication.cc | 2 +-
examples/book/aspectframe/examplewindow.cc | 4 +-
examples/book/assistant/exampleassistant.cc | 6 ++--
examples/book/assistant/examplewindow.cc | 8 ++--
examples/book/box/examplewindow.cc | 27 ++++++++--------
examples/book/box/main.cc | 12 ++++----
examples/book/box/packbox.cc | 4 +--
examples/book/buildapp/step1/exampleapplication.cc | 2 +-
examples/book/buildapp/step2/exampleapplication.cc | 2 +-
examples/book/buildapp/step4/exampleapplication.cc | 2 +-
examples/book/buildapp/step5/exampleapplication.cc | 2 +-
examples/book/buildapp/step6/exampleappwindow.cc | 4 +-
examples/book/buildapp/step7/exampleappwindow.cc | 4 +-
examples/book/buildapp/step8/exampleappwindow.cc | 4 +-
examples/book/buildapp/step9/exampleappwindow.cc | 4 +-
examples/book/builder/derived/deriveddialog.cc | 2 +-
examples/book/buttonbox/examplebuttonbox.cc | 2 +-
examples/book/buttonbox/examplewindow.cc | 20 ++++++------
.../buttons/filechooserbutton/examplewindow.cc | 2 +-
examples/book/buttons/radiobutton/radiobuttons.cc | 6 ++--
examples/book/buttons/scalebutton/examplewindow.cc | 6 ++--
.../book/buttons/volumebutton/examplewindow.cc | 4 +-
examples/book/clipboard/ideal/examplewindow.cc | 4 +-
examples/book/clipboard/ideal/main.cc | 6 ++--
examples/book/clipboard/simple/examplewindow.cc | 4 +-
examples/book/clipboard/simple/main.cc | 6 ++--
.../book/combobox/entry_complex/examplewindow.cc | 2 +-
examples/book/combobox/entry_text/examplewindow.cc | 2 +-
.../book/custom/custom_container/examplewindow.cc | 6 ++--
.../book/custom/custom_container/mycontainer.cc | 6 ++--
.../book/custom/custom_widget/examplewindow.cc | 2 +-
examples/book/custom/custom_widget/mywidget.cc | 4 +-
examples/book/custom/custom_widget/mywidget2.cc | 4 +-
examples/book/dialogs/aboutdialog/examplewindow.cc | 17 +++++-----
.../dialogs/colorchooserdialog/examplewindow.cc | 6 ++--
.../dialogs/filechooserdialog/examplewindow.cc | 22 +++++++-------
.../dialogs/fontchooserdialog/examplewindow.cc | 6 ++--
.../book/dialogs/messagedialog/examplewindow.cc | 10 +++---
examples/book/drawingarea/pango_text/myarea.cc | 2 +-
.../book/drawingarea/thin_lines/examplewindow.cc | 2 +-
examples/book/entry/completion/examplewindow.cc | 2 +-
examples/book/entry/icon/examplewindow.cc | 2 +-
examples/book/entry/progress/examplewindow.cc | 2 +-
examples/book/entry/simple/examplewindow.cc | 2 +-
examples/book/eventbox/examplewindow.cc | 4 +-
examples/book/flowbox/examplewindow.cc | 4 +-
examples/book/frame/examplewindow.cc | 4 +-
.../giomm/monitor_directory/monitor_directory.cc | 14 ++++----
examples/book/giomm/usage/usage.cc | 2 +-
examples/book/grid/examplewindow.cc | 2 +-
examples/book/headerbar/examplewindow.cc | 8 ++--
examples/book/iconview/examplewindow.cc | 8 ++--
examples/book/idle/idleexample.cc | 4 +-
examples/book/infobar/examplewindow.cc | 8 ++--
examples/book/input/main.cc | 4 +-
.../keyboard_events/propagation/examplewindow.cc | 4 +-
.../book/keyboard_events/simple/examplewindow.cc | 2 +-
examples/book/label/examplewindow.cc | 14 ++++----
examples/book/listbox/examplewindow.cc | 22 +++++++-------
examples/book/listmodel/examplewindow.cc | 8 ++--
examples/book/menus/main_menu/examplewindow.cc | 2 +-
examples/book/menus/popup/examplewindow.cc | 2 +-
examples/book/menus_and_toolbars/examplewindow.cc | 2 +-
examples/book/multithread/examplewindow.cc | 8 ++--
examples/book/notebook/examplewindow.cc | 2 +-
examples/book/paned/examplewindow.cc | 2 +-
examples/book/paned/messageslist.cc | 2 +-
examples/book/paned/messagetext.cc | 2 +-
examples/book/placessidebar/examplewindow.cc | 24 +++++++-------
examples/book/popover/examplewindow.cc | 14 ++++----
examples/book/printing/advanced/examplewindow.cc | 14 ++++----
examples/book/printing/advanced/previewdialog.cc | 6 ++--
.../book/printing/advanced/printformoperation.cc | 4 +-
examples/book/printing/simple/examplewindow.cc | 14 ++++----
examples/book/progressbar/examplewindow.cc | 6 ++--
examples/book/range_widgets/examplewindow.cc | 30 +++++++++---------
examples/book/recent_files/examplewindow.cc | 8 ++--
examples/book/revealer/examplewindow.cc | 22 +++++++-------
examples/book/scrolledwindow/examplewindow.cc | 16 +++++-----
examples/book/searchbar/examplewindow.cc | 18 +++++-----
examples/book/spinbutton/examplewindow.cc | 26 ++++++++--------
examples/book/textview/examplewindow.cc | 6 ++--
examples/book/timeout/timerexample.cc | 2 +-
examples/book/toolbar/examplewindow.cc | 6 ++--
examples/book/toolpalette/canvas.cc | 4 +-
examples/book/toolpalette/canvas.h | 4 +-
examples/book/toolpalette/examplewindow.cc | 32 ++++++++++----------
examples/book/tooltips/examplewindow.cc | 12 ++++----
.../book/treeview/combo_renderer/examplewindow.cc | 6 ++--
.../book/treeview/drag_and_drop/examplewindow.cc | 6 ++--
.../book/treeview/editable_cells/examplewindow.cc | 8 ++--
examples/book/treeview/filter/examplewindow.cc | 6 ++--
.../book/treeview/filter_modify/examplewindow.cc | 6 ++--
examples/book/treeview/list/examplewindow.cc | 6 ++--
.../book/treeview/listviewtext/examplewindow.cc | 6 ++--
examples/book/treeview/modelsort/examplewindow.cc | 12 ++++----
examples/book/treeview/popup/examplewindow.cc | 6 ++--
examples/book/treeview/tree/examplewindow.cc | 6 ++--
examples/book/update_ui/examplewindow.cc | 4 +-
examples/others/arrow/arrow.cc | 20 ++++++------
examples/others/calendar/calendar.cc | 22 +++++++-------
.../others/cellrenderercustom/cellrendererlist.cc | 4 +-
.../others/cellrenderercustom/cellrendererpopup.cc | 4 +-
.../cellrenderercustom/cellrenderertoggle.cc | 10 +++---
examples/others/cellrenderercustom/popupentry.cc | 10 +++---
examples/others/dnd/dndwindow.cc | 17 +++++-----
examples/others/exception/exceptiontest.cc | 4 +--
examples/others/idle/idle.cc | 4 +-
examples/others/statusbar/statusbar.cc | 2 +-
examples/others/tictactoe/tictactoe.cc | 2 +-
examples/others/treemodelcustom/examplewindow.cc | 6 ++--
113 files changed, 418 insertions(+), 423 deletions(-)
---
diff --git a/examples/book/actionbar/examplewindow.cc b/examples/book/actionbar/examplewindow.cc
index 1206edb..2b89965 100644
--- a/examples/book/actionbar/examplewindow.cc
+++ b/examples/book/actionbar/examplewindow.cc
@@ -19,8 +19,8 @@
ExampleWindow::ExampleWindow()
: m_gallery_button("Gallery"),
m_effects_button("Effects"),
- m_box(Gtk::ORIENTATION_VERTICAL),
- m_photo_box(Gtk::ORIENTATION_HORIZONTAL)
+ m_box(Gtk::Orientation::VERTICAL),
+ m_photo_box(Gtk::Orientation::HORIZONTAL)
{
// Window properties
set_title("ActionBar Example");
@@ -31,12 +31,12 @@ ExampleWindow::ExampleWindow()
settings->property_gtk_application_prefer_dark_theme().set_value(true);
// Face
- m_face_image.set_from_icon_name("face-cool", Gtk::ICON_SIZE_DIALOG);
+ m_face_image.set_from_icon_name("face-cool", Gtk::BuiltinIconSize::DIALOG);
// Center widget layout
- m_prev_button.set_image_from_icon_name("go-previous-symbolic", Gtk::ICON_SIZE_BUTTON, true);
- m_next_button.set_image_from_icon_name("go-next-symbolic", Gtk::ICON_SIZE_BUTTON, true);
- m_photo_button.set_image_from_icon_name("media-record-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+ m_prev_button.set_image_from_icon_name("go-previous-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
+ m_next_button.set_image_from_icon_name("go-next-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
+ m_photo_button.set_image_from_icon_name("media-record-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
m_photo_box.pack_start(m_prev_button, Gtk::PACK_SHRINK);
m_photo_box.pack_start(m_photo_button, Gtk::PACK_SHRINK);
m_photo_box.pack_start(m_next_button, Gtk::PACK_SHRINK);
diff --git a/examples/book/application/command_line_handling/exampleapplication.cc
b/examples/book/application/command_line_handling/exampleapplication.cc
index a39a595..142d149 100644
--- a/examples/book/application/command_line_handling/exampleapplication.cc
+++ b/examples/book/application/command_line_handling/exampleapplication.cc
@@ -20,7 +20,7 @@
ExampleApplication::ExampleApplication()
: Gtk::Application("org.gtkmm.examples.application",
- Gio::ApplicationFlags(Gio::APPLICATION_HANDLES_OPEN | Gio::APPLICATION_HANDLES_COMMAND_LINE))
+ Gio::ApplicationFlags(Gio::ApplicationFlags::HANDLES_OPEN | Gio::ApplicationFlags::HANDLES_COMMAND_LINE))
{
Glib::set_application_name("Gtk::Application Example");
diff --git a/examples/book/application/simple/exampleapplication.cc
b/examples/book/application/simple/exampleapplication.cc
index 8853a5e..71fb884 100644
--- a/examples/book/application/simple/exampleapplication.cc
+++ b/examples/book/application/simple/exampleapplication.cc
@@ -19,7 +19,7 @@
#include <iostream>
ExampleApplication::ExampleApplication()
-: Gtk::Application("org.gtkmm.examples.application", Gio::APPLICATION_HANDLES_OPEN)
+: Gtk::Application("org.gtkmm.examples.application", Gio::ApplicationFlags::HANDLES_OPEN)
{
Glib::set_application_name("Gtk::Application Example");
}
diff --git a/examples/book/aspectframe/examplewindow.cc b/examples/book/aspectframe/examplewindow.cc
index 1ccc16a..c8b6cfd 100644
--- a/examples/book/aspectframe/examplewindow.cc
+++ b/examples/book/aspectframe/examplewindow.cc
@@ -18,8 +18,8 @@
ExampleWindow::ExampleWindow()
: m_AspectFrame("2x1", /* label */
- Gtk::ALIGN_CENTER, /* center x */
- Gtk::ALIGN_CENTER, /* center y */
+ Gtk::Align::CENTER, /* center x */
+ Gtk::Align::CENTER, /* center y */
2.0, /* xsize/ysize = 2 */
false /* ignore child's aspect */)
{
diff --git a/examples/book/assistant/exampleassistant.cc b/examples/book/assistant/exampleassistant.cc
index 610878b..c7f2a99 100644
--- a/examples/book/assistant/exampleassistant.cc
+++ b/examples/book/assistant/exampleassistant.cc
@@ -18,7 +18,7 @@
#include "exampleassistant.h"
ExampleAssistant::ExampleAssistant()
-: m_box(Gtk::ORIENTATION_HORIZONTAL, 12),
+: m_box(Gtk::Orientation::HORIZONTAL, 12),
m_label1("Type text to allow the assistant to continue:"),
m_label2("Confirmation page"),
m_check("Optional extra information")
@@ -40,8 +40,8 @@ ExampleAssistant::ExampleAssistant()
set_page_complete(m_check, true);
set_page_complete(m_label2, true);
- set_page_type(m_box, Gtk::ASSISTANT_PAGE_INTRO);
- set_page_type(m_label2, Gtk::ASSISTANT_PAGE_CONFIRM);
+ set_page_type(m_box, Gtk::AssistantPageType::INTRO);
+ set_page_type(m_label2, Gtk::AssistantPageType::CONFIRM);
signal_apply().connect(sigc::mem_fun(*this,
&ExampleAssistant::on_assistant_apply));
diff --git a/examples/book/assistant/examplewindow.cc b/examples/book/assistant/examplewindow.cc
index 28d6009..7384b1e 100644
--- a/examples/book/assistant/examplewindow.cc
+++ b/examples/book/assistant/examplewindow.cc
@@ -19,8 +19,8 @@
ExampleWindow::ExampleWindow()
: m_button("Show the assistant"),
- m_label1("State of assistant checkbutton:", Gtk::ALIGN_START, Gtk::ALIGN_CENTER),
- m_label2("Contents of assistant entry:", Gtk::ALIGN_START, Gtk::ALIGN_CENTER)
+ m_label1("State of assistant checkbutton:", Gtk::Align::START, Gtk::Align::CENTER),
+ m_label2("Contents of assistant entry:", Gtk::Align::START, Gtk::Align::CENTER)
{
set_title("Gtk::Assistant example");
@@ -30,14 +30,14 @@ ExampleWindow::ExampleWindow()
m_grid.attach(m_button, 0, 0, 2, 1);
m_button.set_hexpand(true);
- m_button.set_valign(Gtk::ALIGN_CENTER);
+ m_button.set_valign(Gtk::Align::CENTER);
m_grid.attach(m_label1, 0, 1, 1, 1);
m_grid.attach(m_label2, 0, 2, 1, 1);
m_grid.attach(m_check, 1, 1, 1, 1);
- m_check.set_halign(Gtk::ALIGN_START);
+ m_check.set_halign(Gtk::Align::START);
m_grid.attach(m_entry, 1, 2, 1, 1);
m_entry.set_hexpand(true);
diff --git a/examples/book/box/examplewindow.cc b/examples/book/box/examplewindow.cc
index 46b9c15..6e75222 100644
--- a/examples/book/box/examplewindow.cc
+++ b/examples/book/box/examplewindow.cc
@@ -19,7 +19,7 @@
#include "packbox.h"
ExampleWindow::ExampleWindow(int which)
-: m_box1(Gtk::ORIENTATION_VERTICAL),
+: m_box1(Gtk::Orientation::VERTICAL),
m_buttonQuit("Quit")
{
set_title("Gtk::Box example");
@@ -35,11 +35,11 @@ ExampleWindow::ExampleWindow(int which)
{
case 1:
{
- m_Label1.set_text("Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0); set_homogeneous(false);");
+ m_Label1.set_text("Gtk::Box(Gtk::Orientation::HORIZONTAL, 0); set_homogeneous(false);");
// Align the label to the left side.
- m_Label1.set_halign(Gtk::ALIGN_START);
- m_Label1.set_valign(Gtk::ALIGN_START);
+ m_Label1.set_halign(Gtk::Align::START);
+ m_Label1.set_valign(Gtk::Align::START);
// Pack the label into the vertical box (vbox box1). Remember that
// widgets added to a vbox will be packed one on top of the other in
@@ -67,9 +67,9 @@ ExampleWindow::ExampleWindow(int which)
m_box1.pack_start(m_separator1, Gtk::PACK_SHRINK);
// create another new label, and show it.
- m_Label2.set_text("Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0); set_homogeneous(true);");
- m_Label2.set_halign(Gtk::ALIGN_START);
- m_Label2.set_valign(Gtk::ALIGN_START);
+ m_Label2.set_text("Gtk::Box(Gtk::Orientation::HORIZONTAL, 0); set_homogeneous(true);");
+ m_Label2.set_halign(Gtk::Align::START);
+ m_Label2.set_valign(Gtk::Align::START);
m_box1.pack_start(m_Label2, Gtk::PACK_SHRINK);
// Args are: homogeneous, spacing, options, margin
@@ -87,10 +87,9 @@ ExampleWindow::ExampleWindow(int which)
case 2:
{
-
- m_Label1.set_text("Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 10); set_homogeneous(false);");
- m_Label1.set_halign(Gtk::ALIGN_START);
- m_Label1.set_valign(Gtk::ALIGN_START);
+ m_Label1.set_text("Gtk::Box(Gtk::Orientation::HORIZONTAL, 10); set_homogeneous(false);");
+ m_Label1.set_halign(Gtk::Align::START);
+ m_Label1.set_valign(Gtk::Align::START);
m_box1.pack_start(m_Label1, Gtk::PACK_SHRINK);
pPackBox1 = Gtk::manage(new PackBox(false, 10, Gtk::PACK_EXPAND_PADDING));
@@ -101,9 +100,9 @@ ExampleWindow::ExampleWindow(int which)
m_box1.pack_start(m_separator1, Gtk::PACK_SHRINK);
- m_Label2.set_text("Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0); set_homogeneous(false);");
- m_Label2.set_halign(Gtk::ALIGN_START);
- m_Label2.set_valign(Gtk::ALIGN_START);
+ m_Label2.set_text("Gtk::Box(Gtk::Orientation::HORIZONTAL, 0); set_homogeneous(false);");
+ m_Label2.set_halign(Gtk::Align::START);
+ m_Label2.set_valign(Gtk::Align::START);
m_box1.pack_start(m_Label2, Gtk::PACK_SHRINK);
pPackBox3 = Gtk::manage(new PackBox(false, 0, Gtk::PACK_SHRINK, 10));
diff --git a/examples/book/box/main.cc b/examples/book/box/main.cc
index 9aab047..17080ae 100644
--- a/examples/book/box/main.cc
+++ b/examples/book/box/main.cc
@@ -51,24 +51,24 @@ int main(int argc, char *argv[])
int argc1 = argc;
#if GTK_APPLICATION_RECEIVES_COMMAND_LINE_ARGUMENTS
- // The Gio::APPLICATION_HANDLES_COMMAND_LINE flag and the
+ // The Gio::ApplicationFlags::HANDLES_COMMAND_LINE flag and the
// on_command_line() signal handler are not necessary. This program is simpler
// without them, and with argc = 1 in the call to Gtk::Application::run().
- // They are included to show a program with Gio::APPLICATION_HANDLES_COMMAND_LINE.
- // Gio::APPLICATION_NON_UNIQUE makes it possible to run several instances of
+ // They are included to show a program with Gio::ApplicationFlags::HANDLES_COMMAND_LINE.
+ // Gio::ApplicationFlags::NON_UNIQUE makes it possible to run several instances of
// this application simultaneously.
auto app = Gtk::Application::create(
- "org.gtkmm.example", Gio::APPLICATION_HANDLES_COMMAND_LINE | Gio::APPLICATION_NON_UNIQUE);
+ "org.gtkmm.example", Gio::ApplicationFlags::HANDLES_COMMAND_LINE | Gio::ApplicationFlags::NON_UNIQUE);
// Note after = false.
// Only one signal handler is invoked. This signal handler must run before
// the default signal handler, or else it won't run at all.
app->signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), app), false);
#else
- // Gio::APPLICATION_NON_UNIQUE makes it possible to run several instances of
+ // Gio::ApplicationFlags::NON_UNIQUE makes it possible to run several instances of
// this application simultaneously.
argc1 = 1; // Don't give the command line arguments to Gtk::Application.
- auto app = Gtk::Application::create("org.gtkmm.example", Gio::APPLICATION_NON_UNIQUE);
+ auto app = Gtk::Application::create("org.gtkmm.example", Gio::ApplicationFlags::NON_UNIQUE);
#endif
ExampleWindow window(std::atoi(argv[1]));
diff --git a/examples/book/box/packbox.cc b/examples/book/box/packbox.cc
index de1b672..f1c9790 100644
--- a/examples/book/box/packbox.cc
+++ b/examples/book/box/packbox.cc
@@ -1,5 +1,3 @@
-//$Id: packbox.cc 836 2007-05-09 03:02:38Z jjongsma $ -*- c++ -*-
-
/* gtkmm example Copyright (C) 2002 gtkmm development team
*
* This program is free software; you can redistribute it and/or modify
@@ -20,7 +18,7 @@
PackBox::PackBox(bool homogeneous, int spacing, Gtk::PackOptions options,
int margin)
-: Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, spacing),
+: Gtk::Box(Gtk::Orientation::HORIZONTAL, spacing),
m_button1("box.pack_start("),
m_button2("button,"),
m_button3((options == Gtk::PACK_SHRINK) ? "Gtk::PACK_SHRINK);" :
diff --git a/examples/book/buildapp/step1/exampleapplication.cc
b/examples/book/buildapp/step1/exampleapplication.cc
index 956834b..357481c 100644
--- a/examples/book/buildapp/step1/exampleapplication.cc
+++ b/examples/book/buildapp/step1/exampleapplication.cc
@@ -17,7 +17,7 @@
#include "exampleappwindow.h"
ExampleApplication::ExampleApplication()
-: Gtk::Application("org.gtkmm.examples.application", Gio::APPLICATION_HANDLES_OPEN)
+: Gtk::Application("org.gtkmm.examples.application", Gio::ApplicationFlags::HANDLES_OPEN)
{
}
diff --git a/examples/book/buildapp/step2/exampleapplication.cc
b/examples/book/buildapp/step2/exampleapplication.cc
index 59523f9..e57ff38 100644
--- a/examples/book/buildapp/step2/exampleapplication.cc
+++ b/examples/book/buildapp/step2/exampleapplication.cc
@@ -19,7 +19,7 @@
#include <exception>
ExampleApplication::ExampleApplication()
-: Gtk::Application("org.gtkmm.examples.application", Gio::APPLICATION_HANDLES_OPEN)
+: Gtk::Application("org.gtkmm.examples.application", Gio::ApplicationFlags::HANDLES_OPEN)
{
}
diff --git a/examples/book/buildapp/step4/exampleapplication.cc
b/examples/book/buildapp/step4/exampleapplication.cc
index 6a76853..51939cb 100644
--- a/examples/book/buildapp/step4/exampleapplication.cc
+++ b/examples/book/buildapp/step4/exampleapplication.cc
@@ -19,7 +19,7 @@
#include <exception>
ExampleApplication::ExampleApplication()
-: Gtk::Application("org.gtkmm.examples.application", Gio::APPLICATION_HANDLES_OPEN)
+: Gtk::Application("org.gtkmm.examples.application", Gio::ApplicationFlags::HANDLES_OPEN)
{
}
diff --git a/examples/book/buildapp/step5/exampleapplication.cc
b/examples/book/buildapp/step5/exampleapplication.cc
index 937342e..be96e66 100644
--- a/examples/book/buildapp/step5/exampleapplication.cc
+++ b/examples/book/buildapp/step5/exampleapplication.cc
@@ -20,7 +20,7 @@
#include <exception>
ExampleApplication::ExampleApplication()
-: Gtk::Application("org.gtkmm.examples.application", Gio::APPLICATION_HANDLES_OPEN)
+: Gtk::Application("org.gtkmm.examples.application", Gio::ApplicationFlags::HANDLES_OPEN)
{
}
diff --git a/examples/book/buildapp/step6/exampleappwindow.cc
b/examples/book/buildapp/step6/exampleappwindow.cc
index 04c4bdd..e93bd07 100644
--- a/examples/book/buildapp/step6/exampleappwindow.cc
+++ b/examples/book/buildapp/step6/exampleappwindow.cc
@@ -48,7 +48,7 @@ ExampleAppWindow::ExampleAppWindow(BaseObjectType* cobject,
m_settings->bind("transition", m_stack->property_transition_type());
m_prop_binding = Glib::Binding::bind_property(m_search->property_active(),
- m_searchbar->property_search_mode_enabled(), Glib::BINDING_BIDIRECTIONAL);
+ m_searchbar->property_search_mode_enabled(), Glib::BindingFlags::BIDIRECTIONAL);
// Connect signal handlers.
m_searchentry->signal_search_changed().connect(
@@ -134,7 +134,7 @@ void ExampleAppWindow::on_search_text_changed()
auto buffer = view->get_buffer();
Gtk::TextIter match_start;
Gtk::TextIter match_end;
- if (buffer->begin().forward_search(text, Gtk::TEXT_SEARCH_CASE_INSENSITIVE,
+ if (buffer->begin().forward_search(text, Gtk::TextSearchFlags::CASE_INSENSITIVE,
match_start, match_end))
{
buffer->select_range(match_start, match_end);
diff --git a/examples/book/buildapp/step7/exampleappwindow.cc
b/examples/book/buildapp/step7/exampleappwindow.cc
index ea36d20..58c0770 100644
--- a/examples/book/buildapp/step7/exampleappwindow.cc
+++ b/examples/book/buildapp/step7/exampleappwindow.cc
@@ -68,7 +68,7 @@ ExampleAppWindow::ExampleAppWindow(BaseObjectType* cobject,
// Bind properties.
m_prop_binding = Glib::Binding::bind_property(m_search->property_active(),
- m_searchbar->property_search_mode_enabled(), Glib::BINDING_BIDIRECTIONAL);
+ m_searchbar->property_search_mode_enabled(), Glib::BindingFlags::BIDIRECTIONAL);
// Connect signal handlers.
m_searchentry->signal_search_changed().connect(
@@ -169,7 +169,7 @@ void ExampleAppWindow::on_search_text_changed()
auto buffer = view->get_buffer();
Gtk::TextIter match_start;
Gtk::TextIter match_end;
- if (buffer->begin().forward_search(text, Gtk::TEXT_SEARCH_CASE_INSENSITIVE,
+ if (buffer->begin().forward_search(text, Gtk::TextSearchFlags::CASE_INSENSITIVE,
match_start, match_end))
{
buffer->select_range(match_start, match_end);
diff --git a/examples/book/buildapp/step8/exampleappwindow.cc
b/examples/book/buildapp/step8/exampleappwindow.cc
index 68e6689..db20b21 100644
--- a/examples/book/buildapp/step8/exampleappwindow.cc
+++ b/examples/book/buildapp/step8/exampleappwindow.cc
@@ -79,7 +79,7 @@ ExampleAppWindow::ExampleAppWindow(BaseObjectType* cobject,
// Bind properties of the search button to the search bar.
m_binding_search_enabled = Glib::Binding::bind_property(m_search->property_active(),
- m_searchbar->property_search_mode_enabled(), Glib::BINDING_BIDIRECTIONAL);
+ m_searchbar->property_search_mode_enabled(), Glib::BindingFlags::BIDIRECTIONAL);
// Connect signal handlers.
m_searchentry->signal_search_changed().connect(
@@ -187,7 +187,7 @@ void ExampleAppWindow::on_search_text_changed()
auto buffer = view->get_buffer();
Gtk::TextIter match_start;
Gtk::TextIter match_end;
- if (buffer->begin().forward_search(text, Gtk::TEXT_SEARCH_CASE_INSENSITIVE,
+ if (buffer->begin().forward_search(text, Gtk::TextSearchFlags::CASE_INSENSITIVE,
match_start, match_end))
{
buffer->select_range(match_start, match_end);
diff --git a/examples/book/buildapp/step9/exampleappwindow.cc
b/examples/book/buildapp/step9/exampleappwindow.cc
index ceea00b..03860e9 100644
--- a/examples/book/buildapp/step9/exampleappwindow.cc
+++ b/examples/book/buildapp/step9/exampleappwindow.cc
@@ -79,7 +79,7 @@ ExampleAppWindow::ExampleAppWindow(BaseObjectType* cobject,
// Bind properties of the search button to the search bar.
m_binding_search_enabled = Glib::Binding::bind_property(m_search->property_active(),
- m_searchbar->property_search_mode_enabled(), Glib::BINDING_BIDIRECTIONAL);
+ m_searchbar->property_search_mode_enabled(), Glib::BindingFlags::BIDIRECTIONAL);
// Connect signal handlers.
m_searchentry->signal_search_changed().connect(
@@ -196,7 +196,7 @@ void ExampleAppWindow::on_search_text_changed()
auto buffer = view->get_buffer();
Gtk::TextIter match_start;
Gtk::TextIter match_end;
- if (buffer->begin().forward_search(text, Gtk::TEXT_SEARCH_CASE_INSENSITIVE,
+ if (buffer->begin().forward_search(text, Gtk::TextSearchFlags::CASE_INSENSITIVE,
match_start, match_end))
{
buffer->select_range(match_start, match_end);
diff --git a/examples/book/builder/derived/deriveddialog.cc b/examples/book/builder/derived/deriveddialog.cc
index 3a1d565..f115229 100644
--- a/examples/book/builder/derived/deriveddialog.cc
+++ b/examples/book/builder/derived/deriveddialog.cc
@@ -39,7 +39,7 @@ DerivedDialog::DerivedDialog(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Bu
{
// Show an icon.
auto pImage = Gtk::manage(new Gtk::Image());
- pImage->set_from_icon_name(is_glad ? "face-smile" : "face-sad", Gtk::ICON_SIZE_DIALOG);
+ pImage->set_from_icon_name(is_glad ? "face-smile" : "face-sad", Gtk::BuiltinIconSize::DIALOG);
get_content_area()->pack_start(*pImage);
}
diff --git a/examples/book/buttonbox/examplebuttonbox.cc b/examples/book/buttonbox/examplebuttonbox.cc
index 40f10cd..1aa5fba 100644
--- a/examples/book/buttonbox/examplebuttonbox.cc
+++ b/examples/book/buttonbox/examplebuttonbox.cc
@@ -25,7 +25,7 @@ ExampleButtonBox::ExampleButtonBox(bool horizontal,
m_Button_Cancel("Cancel"),
m_Button_Help("Help")
{
- auto orientation = horizontal ? Gtk::ORIENTATION_HORIZONTAL : Gtk::ORIENTATION_VERTICAL;
+ auto orientation = horizontal ? Gtk::Orientation::HORIZONTAL : Gtk::Orientation::VERTICAL;
auto bbox = Gtk::manage(new Gtk::ButtonBox(orientation));
if (!horizontal)
diff --git a/examples/book/buttonbox/examplewindow.cc b/examples/book/buttonbox/examplewindow.cc
index 5ae608f..2af9a2f 100644
--- a/examples/book/buttonbox/examplewindow.cc
+++ b/examples/book/buttonbox/examplewindow.cc
@@ -18,8 +18,8 @@
#include "examplebuttonbox.h"
ExampleWindow::ExampleWindow()
-: m_VBox_Main(Gtk::ORIENTATION_VERTICAL),
- m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox_Main(Gtk::Orientation::VERTICAL),
+ m_VBox(Gtk::Orientation::VERTICAL),
m_Frame_Horizontal("Horizontal Button Boxes"),
m_Frame_Vertical("Vertical Button Boxes")
{
@@ -35,22 +35,22 @@ ExampleWindow::ExampleWindow()
m_VBox.pack_start(*Gtk::manage(
new ExampleButtonBox(true, "Spread (spacing 40)", 40,
- Gtk::BUTTONBOX_SPREAD)),
+ Gtk::ButtonBoxStyle::SPREAD)),
Gtk::PACK_EXPAND_WIDGET);
m_VBox.pack_start(*Gtk::manage(
new ExampleButtonBox(true, "Edge (spacing 30)", 30,
- Gtk::BUTTONBOX_EDGE)),
+ Gtk::ButtonBoxStyle::EDGE)),
Gtk::PACK_EXPAND_WIDGET, 5);
m_VBox.pack_start(*Gtk::manage(
new ExampleButtonBox(true, "Start (spacing 20)", 20,
- Gtk::BUTTONBOX_START)),
+ Gtk::ButtonBoxStyle::START)),
Gtk::PACK_EXPAND_WIDGET, 5);
m_VBox.pack_start(*Gtk::manage(
new ExampleButtonBox(true, "End (spacing 10)", 10,
- Gtk::BUTTONBOX_END)),
+ Gtk::ButtonBoxStyle::END)),
Gtk::PACK_EXPAND_WIDGET, 5);
@@ -62,21 +62,21 @@ ExampleWindow::ExampleWindow()
m_HBox.pack_start(*Gtk::manage(
new ExampleButtonBox(false, "Spread (spacing 5)", 5,
- Gtk::BUTTONBOX_SPREAD)),
+ Gtk::ButtonBoxStyle::SPREAD)),
Gtk::PACK_EXPAND_WIDGET);
m_HBox.pack_start(*Gtk::manage(
new ExampleButtonBox(false, "Edge (spacing 30)", 30,
- Gtk::BUTTONBOX_EDGE)),
+ Gtk::ButtonBoxStyle::EDGE)),
Gtk::PACK_EXPAND_WIDGET, 5);
m_HBox.pack_start(*Gtk::manage(
new ExampleButtonBox(false, "Start (spacing 20)", 20,
- Gtk::BUTTONBOX_START)),
+ Gtk::ButtonBoxStyle::START)),
Gtk::PACK_EXPAND_WIDGET, 5);
m_HBox.pack_start(*Gtk::manage(new ExampleButtonBox(false, "End (spacing 10)",
- 10, Gtk::BUTTONBOX_END)),
+ 10, Gtk::ButtonBoxStyle::END)),
Gtk::PACK_EXPAND_WIDGET, 5);
}
diff --git a/examples/book/buttons/filechooserbutton/examplewindow.cc
b/examples/book/buttons/filechooserbutton/examplewindow.cc
index 047f677..155ca9f 100644
--- a/examples/book/buttons/filechooserbutton/examplewindow.cc
+++ b/examples/book/buttons/filechooserbutton/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_button("Select file", Gtk::FILE_CHOOSER_ACTION_OPEN)
+: m_button("Select file", Gtk::FileChooserAction::OPEN)
{
set_default_size(200, -1);
diff --git a/examples/book/buttons/radiobutton/radiobuttons.cc
b/examples/book/buttons/radiobutton/radiobuttons.cc
index 9ec620d..d9c40dc 100644
--- a/examples/book/buttons/radiobutton/radiobuttons.cc
+++ b/examples/book/buttons/radiobutton/radiobuttons.cc
@@ -18,9 +18,9 @@
RadioButtons::RadioButtons() :
- m_Box_Top(Gtk::ORIENTATION_VERTICAL),
- m_Box1(Gtk::ORIENTATION_VERTICAL, 10),
- m_Box2(Gtk::ORIENTATION_VERTICAL, 10),
+ m_Box_Top(Gtk::Orientation::VERTICAL),
+ m_Box1(Gtk::Orientation::VERTICAL, 10),
+ m_Box2(Gtk::Orientation::VERTICAL, 10),
m_RadioButton1("button1"),
m_RadioButton2("button2"),
m_RadioButton3("button3"),
diff --git a/examples/book/buttons/scalebutton/examplewindow.cc
b/examples/book/buttons/scalebutton/examplewindow.cc
index 6c5e8e3..755d9f9 100644
--- a/examples/book/buttons/scalebutton/examplewindow.cc
+++ b/examples/book/buttons/scalebutton/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_button(Gtk::ICON_SIZE_BUTTON, 0.0, 100.0, 10.0)
+: m_button(Gtk::BuiltinIconSize::BUTTON, 0.0, 100.0, 10.0)
{
//Make the window big enough to show the popup scale from the GtkVolumeButton.
//Otherwise it will be truncated.
@@ -38,8 +38,8 @@ ExampleWindow::ExampleWindow()
m_grid.set_hexpand(true);
m_grid.attach(m_button, 1, 1, 1, 1);
- m_button.set_valign(Gtk::ALIGN_END);
- m_button.set_halign(Gtk::ALIGN_END);
+ m_button.set_valign(Gtk::Align::END);
+ m_button.set_halign(Gtk::Align::END);
m_button.set_value(30.0);
m_button.signal_value_changed().connect(
diff --git a/examples/book/buttons/volumebutton/examplewindow.cc
b/examples/book/buttons/volumebutton/examplewindow.cc
index 5987b79..5bf7493 100644
--- a/examples/book/buttons/volumebutton/examplewindow.cc
+++ b/examples/book/buttons/volumebutton/examplewindow.cc
@@ -31,8 +31,8 @@ ExampleWindow::ExampleWindow()
m_button.set_hexpand(true);
m_grid.attach(m_button, 1, 1, 1, 1);
- m_button.set_valign(Gtk::ALIGN_END);
- m_button.set_halign(Gtk::ALIGN_END);
+ m_button.set_valign(Gtk::Align::END);
+ m_button.set_halign(Gtk::Align::END);
m_button.set_value(0.4);
m_button.signal_value_changed().connect(
diff --git a/examples/book/clipboard/ideal/examplewindow.cc b/examples/book/clipboard/ideal/examplewindow.cc
index 5d706c2..1aeb42a 100644
--- a/examples/book/clipboard/ideal/examplewindow.cc
+++ b/examples/book/clipboard/ideal/examplewindow.cc
@@ -28,7 +28,7 @@ const char example_target_text[] = "UTF8_STRING";
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Label("Select cells in the grid, click Copy, then open a second instance "
"of this example to try pasting the copied data.\nOr try pasting the "
"text representation into gedit."),
@@ -56,7 +56,7 @@ ExampleWindow::ExampleWindow()
m_VBox.set_spacing(6);
//Fill ButtonBox:
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_ButtonBox.pack_start(m_Button_Copy, Gtk::PACK_SHRINK);
m_Button_Copy.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_copy) );
diff --git a/examples/book/clipboard/ideal/main.cc b/examples/book/clipboard/ideal/main.cc
index c790e60..de79e5e 100644
--- a/examples/book/clipboard/ideal/main.cc
+++ b/examples/book/clipboard/ideal/main.cc
@@ -19,10 +19,10 @@
int main(int argc, char *argv[])
{
- //APPLICATION_NON_UNIQUE because it shall be possible to run several
- //instances of this application simultaneously.
+ // Gio::ApplicationFlags::NON_UNIQUE because it shall be possible to run
+ // several instances of this application simultaneously.
auto app = Gtk::Application::create(
- "org.gtkmm.example", Gio::APPLICATION_NON_UNIQUE);
+ "org.gtkmm.example", Gio::ApplicationFlags::NON_UNIQUE);
ExampleWindow window;
diff --git a/examples/book/clipboard/simple/examplewindow.cc b/examples/book/clipboard/simple/examplewindow.cc
index 254de96..4427bed 100644
--- a/examples/book/clipboard/simple/examplewindow.cc
+++ b/examples/book/clipboard/simple/examplewindow.cc
@@ -17,7 +17,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Label("Select cells in the grid, click Copy, then open a second "
"instance of this example to try pasting the copied data."),
m_ButtonA1("A1"), m_ButtonA2("A2"), m_ButtonB1("B1"), m_ButtonB2("B2"),
@@ -44,7 +44,7 @@ ExampleWindow::ExampleWindow()
m_VBox.set_spacing(6);
//Fill ButtonBox:
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_ButtonBox.pack_start(m_Button_Copy, Gtk::PACK_SHRINK);
m_Button_Copy.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_copy) );
diff --git a/examples/book/clipboard/simple/main.cc b/examples/book/clipboard/simple/main.cc
index c790e60..de79e5e 100644
--- a/examples/book/clipboard/simple/main.cc
+++ b/examples/book/clipboard/simple/main.cc
@@ -19,10 +19,10 @@
int main(int argc, char *argv[])
{
- //APPLICATION_NON_UNIQUE because it shall be possible to run several
- //instances of this application simultaneously.
+ // Gio::ApplicationFlags::NON_UNIQUE because it shall be possible to run
+ // several instances of this application simultaneously.
auto app = Gtk::Application::create(
- "org.gtkmm.example", Gio::APPLICATION_NON_UNIQUE);
+ "org.gtkmm.example", Gio::ApplicationFlags::NON_UNIQUE);
ExampleWindow window;
diff --git a/examples/book/combobox/entry_complex/examplewindow.cc
b/examples/book/combobox/entry_complex/examplewindow.cc
index 2d03c25..668d7c7 100644
--- a/examples/book/combobox/entry_complex/examplewindow.cc
+++ b/examples/book/combobox/entry_complex/examplewindow.cc
@@ -72,7 +72,7 @@ ExampleWindow::ExampleWindow()
if (entry)
{
// The Entry shall receive focus-out events.
- entry->add_events(Gdk::FOCUS_CHANGE_MASK);
+ entry->add_events(Gdk::EventMask::FOCUS_CHANGE_MASK);
// Alternatively you can connect to m_Combo.signal_changed().
entry->signal_changed().connect(sigc::mem_fun(*this,
&ExampleWindow::on_entry_changed) );
diff --git a/examples/book/combobox/entry_text/examplewindow.cc
b/examples/book/combobox/entry_text/examplewindow.cc
index 66cbaac..12e37af 100644
--- a/examples/book/combobox/entry_text/examplewindow.cc
+++ b/examples/book/combobox/entry_text/examplewindow.cc
@@ -38,7 +38,7 @@ ExampleWindow::ExampleWindow()
if (entry)
{
// The Entry shall receive focus-out events.
- entry->add_events(Gdk::FOCUS_CHANGE_MASK);
+ entry->add_events(Gdk::EventMask::FOCUS_CHANGE_MASK);
entry->signal_activate().connect(sigc::mem_fun(*this,
&ExampleWindow::on_entry_activate) );
m_ConnectionFocusOut = entry->signal_focus_out_event().
diff --git a/examples/book/custom/custom_container/examplewindow.cc
b/examples/book/custom/custom_container/examplewindow.cc
index fa2f16c..8db299b 100644
--- a/examples/book/custom/custom_container/examplewindow.cc
+++ b/examples/book/custom/custom_container/examplewindow.cc
@@ -18,9 +18,9 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_One("Child One"),
- m_Label_Two("Child 2", Gtk::ALIGN_END, Gtk::ALIGN_CENTER),
+ m_Label_Two("Child 2", Gtk::Align::END, Gtk::Align::CENTER),
m_Button_Quit("Quit")
{
set_title("Custom Container example");
@@ -37,7 +37,7 @@ ExampleWindow::ExampleWindow()
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(6);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
}
diff --git a/examples/book/custom/custom_container/mycontainer.cc
b/examples/book/custom/custom_container/mycontainer.cc
index 7107754..bd52e15 100644
--- a/examples/book/custom/custom_container/mycontainer.cc
+++ b/examples/book/custom/custom_container/mycontainer.cc
@@ -47,7 +47,7 @@ void MyContainer::set_child_widgets(Gtk::Widget& child_one,
// This example container is a simplified vertical Box with at most two children.
Gtk::SizeRequestMode MyContainer::get_request_mode_vfunc() const
{
- return Gtk::SIZE_REQUEST_HEIGHT_FOR_WIDTH;
+ return Gtk::SizeRequestMode::HEIGHT_FOR_WIDTH;
}
// Discover the total amount of minimum space and natural space needed by
@@ -62,7 +62,7 @@ void MyContainer::measure_vfunc(Gtk::Orientation orientation, int for_size,
int dummy_minimum_baseline = 0;
int dummy_natural_baseline = 0;
- if (orientation == Gtk::ORIENTATION_HORIZONTAL)
+ if (orientation == Gtk::Orientation::HORIZONTAL)
{
int height_per_child = for_size;
@@ -96,7 +96,7 @@ void MyContainer::measure_vfunc(Gtk::Orientation orientation, int for_size,
minimum = std::max(child_minimum_width[0], child_minimum_width[1]);
natural = std::max(child_natural_width[0], child_natural_width[1]);
}
- else // Gtk::ORIENTATION_VERTICAL
+ else // Gtk::Orientation::VERTICAL
{
int child_minimum_height[2] = {0, 0};
int child_natural_height[2] = {0, 0};
diff --git a/examples/book/custom/custom_widget/examplewindow.cc
b/examples/book/custom/custom_widget/examplewindow.cc
index da9feb7..67866a3 100644
--- a/examples/book/custom/custom_widget/examplewindow.cc
+++ b/examples/book/custom/custom_widget/examplewindow.cc
@@ -37,7 +37,7 @@ ExampleWindow::ExampleWindow()
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(6);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this, &ExampleWindow::on_button_quit) );
}
diff --git a/examples/book/custom/custom_widget/mywidget.cc b/examples/book/custom/custom_widget/mywidget.cc
index 05303b3..26269b6 100644
--- a/examples/book/custom/custom_widget/mywidget.cc
+++ b/examples/book/custom/custom_widget/mywidget.cc
@@ -95,7 +95,7 @@ Gtk::SizeRequestMode MyWidget::get_request_mode_vfunc() const
void MyWidget::measure_vfunc(Gtk::Orientation orientation, int /* for_size */,
int& minimum, int& natural, int& minimum_baseline, int& natural_baseline) const
{
- if (orientation == Gtk::ORIENTATION_HORIZONTAL)
+ if (orientation == Gtk::Orientation::HORIZONTAL)
{
minimum = 60;
natural = 100;
@@ -155,7 +155,7 @@ void MyWidget::on_realize()
{
//Create the GdkWindow:
m_refGdkWindow = Gdk::Window::create_child(get_parent_window(),
- get_events () | Gdk::EXPOSURE_MASK, get_allocation());
+ get_events () | Gdk::EventMask::EXPOSURE_MASK, get_allocation());
set_window(m_refGdkWindow);
//make the widget receive expose events
diff --git a/examples/book/custom/custom_widget/mywidget2.cc b/examples/book/custom/custom_widget/mywidget2.cc
index 7020335..fc52bab 100644
--- a/examples/book/custom/custom_widget/mywidget2.cc
+++ b/examples/book/custom/custom_widget/mywidget2.cc
@@ -94,7 +94,7 @@ Gtk::SizeRequestMode MyWidget2::get_request_mode_vfunc() const
void MyWidget2::measure_vfunc(Gtk::Orientation orientation, int /* for_size */,
int& minimum, int& natural, int& minimum_baseline, int& natural_baseline) const
{
- if (orientation == Gtk::ORIENTATION_HORIZONTAL)
+ if (orientation == Gtk::Orientation::HORIZONTAL)
{
minimum = 60;
natural = 100;
@@ -154,7 +154,7 @@ void MyWidget2::on_realize()
{
//Create the GdkWindow:
m_refGdkWindow = Gdk::Window::create_child(get_parent_window(),
- get_events () | Gdk::EXPOSURE_MASK, get_allocation());
+ get_events () | Gdk::EventMask::EXPOSURE_MASK, get_allocation());
set_window(m_refGdkWindow);
//make the widget receive expose events
diff --git a/examples/book/dialogs/aboutdialog/examplewindow.cc
b/examples/book/dialogs/aboutdialog/examplewindow.cc
index 55e383a..3297ff9 100644
--- a/examples/book/dialogs/aboutdialog/examplewindow.cc
+++ b/examples/book/dialogs/aboutdialog/examplewindow.cc
@@ -18,10 +18,10 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Label("The AboutDialog is non-modal. "
"You can select parts of this text while the AboutDialog is shown."),
- m_ButtonBox(Gtk::ORIENTATION_VERTICAL),
+ m_ButtonBox(Gtk::Orientation::VERTICAL),
m_Button("Show AboutDialog")
{
set_title("Gtk::AboutDialog example");
@@ -63,22 +63,21 @@ ExampleWindow::ExampleWindow()
ExampleWindow::~ExampleWindow()
{
-
}
void ExampleWindow::on_about_dialog_response(int response_id)
{
std::cout << response_id
- << ", close=" << Gtk::RESPONSE_CLOSE
- << ", cancel=" << Gtk::RESPONSE_CANCEL
- << ", delete_event=" << Gtk::RESPONSE_DELETE_EVENT
+ << ", close=" << static_cast<int>(Gtk::ResponseType::CLOSE)
+ << ", cancel=" << static_cast<int>(Gtk::ResponseType::CANCEL)
+ << ", delete_event=" << static_cast<int>(Gtk::ResponseType::DELETE_EVENT)
<< std::endl;
switch (response_id)
{
- case Gtk::RESPONSE_CLOSE:
- case Gtk::RESPONSE_CANCEL:
- case Gtk::RESPONSE_DELETE_EVENT:
+ case static_cast<int>(Gtk::ResponseType::CLOSE):
+ case static_cast<int>(Gtk::ResponseType::CANCEL):
+ case static_cast<int>(Gtk::ResponseType::DELETE_EVENT):
m_Dialog.hide();
break;
default:
diff --git a/examples/book/dialogs/colorchooserdialog/examplewindow.cc
b/examples/book/dialogs/colorchooserdialog/examplewindow.cc
index 3db49d2..130de1a 100644
--- a/examples/book/dialogs/colorchooserdialog/examplewindow.cc
+++ b/examples/book/dialogs/colorchooserdialog/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
+: m_VBox(Gtk::Orientation::VERTICAL, 5),
m_Button_Dialog("Choose Color")
{
set_title("Gtk::ColorChooserDialog example");
@@ -68,14 +68,14 @@ void ExampleWindow::on_button_dialog_clicked()
//Handle the response:
switch(result)
{
- case Gtk::RESPONSE_OK:
+ case static_cast<int>(Gtk::ResponseType::OK):
{
//Store the chosen color:
m_Color = dialog.get_rgba();
m_ColorButton.set_rgba(m_Color);
break;
}
- case Gtk::RESPONSE_CANCEL:
+ case static_cast<int>(Gtk::ResponseType::CANCEL):
{
std::cout << "Cancel clicked." << std::endl;
break;
diff --git a/examples/book/dialogs/filechooserdialog/examplewindow.cc
b/examples/book/dialogs/filechooserdialog/examplewindow.cc
index 38485cb..e59400b 100644
--- a/examples/book/dialogs/filechooserdialog/examplewindow.cc
+++ b/examples/book/dialogs/filechooserdialog/examplewindow.cc
@@ -19,7 +19,7 @@
ExampleWindow::ExampleWindow()
-: m_ButtonBox(Gtk::ORIENTATION_VERTICAL),
+: m_ButtonBox(Gtk::Orientation::VERTICAL),
m_Button_File("Choose File"),
m_Button_Folder("Choose Folder")
{
@@ -43,26 +43,26 @@ ExampleWindow::~ExampleWindow()
void ExampleWindow::on_button_folder_clicked()
{
Gtk::FileChooserDialog dialog("Please choose a folder",
- Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ Gtk::FileChooserAction::SELECT_FOLDER);
dialog.set_transient_for(*this);
//Add response buttons the the dialog:
- dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL);
- dialog.add_button("Select", Gtk::RESPONSE_OK);
+ dialog.add_button("_Cancel", Gtk::ResponseType::CANCEL);
+ dialog.add_button("Select", Gtk::ResponseType::OK);
int result = dialog.run();
//Handle the response:
switch(result)
{
- case(Gtk::RESPONSE_OK):
+ case static_cast<int>(Gtk::ResponseType::OK):
{
std::cout << "Select clicked." << std::endl;
std::cout << "Folder selected: " << dialog.get_filename()
<< std::endl;
break;
}
- case(Gtk::RESPONSE_CANCEL):
+ case static_cast<int>(Gtk::ResponseType::CANCEL):
{
std::cout << "Cancel clicked." << std::endl;
break;
@@ -78,12 +78,12 @@ void ExampleWindow::on_button_folder_clicked()
void ExampleWindow::on_button_file_clicked()
{
Gtk::FileChooserDialog dialog("Please choose a file",
- Gtk::FILE_CHOOSER_ACTION_OPEN);
+ Gtk::FileChooserAction::OPEN);
dialog.set_transient_for(*this);
//Add response buttons the the dialog:
- dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL);
- dialog.add_button("_Open", Gtk::RESPONSE_OK);
+ dialog.add_button("_Cancel", Gtk::ResponseType::CANCEL);
+ dialog.add_button("_Open", Gtk::ResponseType::OK);
//Add filters, so that only certain file types can be selected:
@@ -110,7 +110,7 @@ void ExampleWindow::on_button_file_clicked()
//Handle the response:
switch(result)
{
- case(Gtk::RESPONSE_OK):
+ case static_cast<int>(Gtk::ResponseType::OK):
{
std::cout << "Open clicked." << std::endl;
@@ -119,7 +119,7 @@ void ExampleWindow::on_button_file_clicked()
std::cout << "File selected: " << filename << std::endl;
break;
}
- case(Gtk::RESPONSE_CANCEL):
+ case static_cast<int>(Gtk::ResponseType::CANCEL):
{
std::cout << "Cancel clicked." << std::endl;
break;
diff --git a/examples/book/dialogs/fontchooserdialog/examplewindow.cc
b/examples/book/dialogs/fontchooserdialog/examplewindow.cc
index 53b8b81..5f27d3d 100644
--- a/examples/book/dialogs/fontchooserdialog/examplewindow.cc
+++ b/examples/book/dialogs/fontchooserdialog/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_ButtonBox(Gtk::ORIENTATION_VERTICAL),
+: m_ButtonBox(Gtk::Orientation::VERTICAL),
m_FontButton("Sans 10"),
m_Button_Dialog("Choose Font")
{
@@ -59,14 +59,14 @@ void ExampleWindow::on_button_dialog_clicked()
//Handle the response:
switch(result)
{
- case Gtk::RESPONSE_OK:
+ case static_cast<int>(Gtk::ResponseType::OK):
{
auto font_name = dialog.get_font();
std::cout << "Font chosen: " << font_name << std::endl;
m_FontButton.set_font_name(font_name);
break;
}
- case Gtk::RESPONSE_CANCEL:
+ case static_cast<int>(Gtk::ResponseType::CANCEL):
{
std::cout << "Cancel clicked." << std::endl;
break;
diff --git a/examples/book/dialogs/messagedialog/examplewindow.cc
b/examples/book/dialogs/messagedialog/examplewindow.cc
index 0a3f296..ebc9f17 100644
--- a/examples/book/dialogs/messagedialog/examplewindow.cc
+++ b/examples/book/dialogs/messagedialog/examplewindow.cc
@@ -20,7 +20,7 @@
ExampleWindow::ExampleWindow()
-: m_ButtonBox(Gtk::ORIENTATION_VERTICAL),
+: m_ButtonBox(Gtk::Orientation::VERTICAL),
m_Button_Info("Show Info MessageDialog"),
m_Button_Question("Show Question MessageDialog")
{
@@ -53,8 +53,8 @@ void ExampleWindow::on_button_info_clicked()
void ExampleWindow::on_button_question_clicked()
{
Gtk::MessageDialog dialog(*this, "This is a QUESTION MessageDialog",
- false /* use_markup */, Gtk::MESSAGE_QUESTION,
- Gtk::BUTTONS_OK_CANCEL);
+ false /* use_markup */, Gtk::MessageType::QUESTION,
+ Gtk::ButtonsType::OK_CANCEL);
dialog.set_secondary_text(
"And this is the secondary text that explains things.");
@@ -63,12 +63,12 @@ void ExampleWindow::on_button_question_clicked()
//Handle the response:
switch(result)
{
- case(Gtk::RESPONSE_OK):
+ case static_cast<int>(Gtk::ResponseType::OK):
{
std::cout << "OK clicked." << std::endl;
break;
}
- case(Gtk::RESPONSE_CANCEL):
+ case static_cast<int>(Gtk::ResponseType::CANCEL):
{
std::cout << "Cancel clicked." << std::endl;
break;
diff --git a/examples/book/drawingarea/pango_text/myarea.cc b/examples/book/drawingarea/pango_text/myarea.cc
index dd9a299..d30d294 100644
--- a/examples/book/drawingarea/pango_text/myarea.cc
+++ b/examples/book/drawingarea/pango_text/myarea.cc
@@ -72,7 +72,7 @@ void MyArea::draw_text(const Cairo::RefPtr<Cairo::Context>& cr,
Pango::FontDescription font;
font.set_family("Monospace");
- font.set_weight(Pango::WEIGHT_BOLD);
+ font.set_weight(Pango::Weight::BOLD);
// http://developer.gnome.org/pangomm/unstable/classPango_1_1Layout.html
auto layout = create_pango_layout("Hi there!");
diff --git a/examples/book/drawingarea/thin_lines/examplewindow.cc
b/examples/book/drawingarea/thin_lines/examplewindow.cc
index 5d234ae..dd3e711 100644
--- a/examples/book/drawingarea/thin_lines/examplewindow.cc
+++ b/examples/book/drawingarea/thin_lines/examplewindow.cc
@@ -21,7 +21,7 @@ ExampleWindow::ExampleWindow()
{
set_title("Thin lines example");
- m_Container.set_orientation(Gtk::ORIENTATION_HORIZONTAL);
+ m_Container.set_orientation(Gtk::Orientation::HORIZONTAL);
m_Container.add(m_Area_Lines);
m_Container.add(m_Button_FixLines);
diff --git a/examples/book/entry/completion/examplewindow.cc b/examples/book/entry/completion/examplewindow.cc
index b1834f0..b3cfd66 100644
--- a/examples/book/entry/completion/examplewindow.cc
+++ b/examples/book/entry/completion/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Label("Press a or b to see a list of possible completions and actions."),
m_Button_Close("Close")
{
diff --git a/examples/book/entry/icon/examplewindow.cc b/examples/book/entry/icon/examplewindow.cc
index 20cf8f1..3d5039b 100644
--- a/examples/book/entry/icon/examplewindow.cc
+++ b/examples/book/entry/icon/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Close("Close")
{
set_title("Gtk::Entry");
diff --git a/examples/book/entry/progress/examplewindow.cc b/examples/book/entry/progress/examplewindow.cc
index 6e2978e..0df997d 100644
--- a/examples/book/entry/progress/examplewindow.cc
+++ b/examples/book/entry/progress/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Close("Close")
{
set_title("Gtk::Entry");
diff --git a/examples/book/entry/simple/examplewindow.cc b/examples/book/entry/simple/examplewindow.cc
index a12bb50..34d878a 100644
--- a/examples/book/entry/simple/examplewindow.cc
+++ b/examples/book/entry/simple/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Close("Close"),
m_CheckButton_Editable("Editable"),
m_CheckButton_Visible("Visible")
diff --git a/examples/book/eventbox/examplewindow.cc b/examples/book/eventbox/examplewindow.cc
index 773f249..72feae6 100644
--- a/examples/book/eventbox/examplewindow.cc
+++ b/examples/book/eventbox/examplewindow.cc
@@ -29,10 +29,10 @@ ExampleWindow::ExampleWindow()
//Clip the label short:
set_default_size(110, 20);
m_Label.set_size_request(110, 20);
- m_Label.set_ellipsize(Pango::ELLIPSIZE_END);
+ m_Label.set_ellipsize(Pango::EllipsizeMode::END);
//And bind an action to it:
- m_EventBox.set_events(Gdk::BUTTON_PRESS_MASK);
+ m_EventBox.set_events(Gdk::EventMask::BUTTON_PRESS_MASK);
m_EventBox.signal_button_press_event().connect(
sigc::mem_fun(*this, &ExampleWindow::on_eventbox_button_press) );
diff --git a/examples/book/flowbox/examplewindow.cc b/examples/book/flowbox/examplewindow.cc
index 15236ae..6e10482 100644
--- a/examples/book/flowbox/examplewindow.cc
+++ b/examples/book/flowbox/examplewindow.cc
@@ -23,11 +23,11 @@ ExampleWindow::ExampleWindow()
set_default_size(600, 400);
// Scrolled window
- m_scrolled_window.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ m_scrolled_window.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
// Flow box
m_flow_box.set_max_children_per_line(30);
- m_flow_box.set_selection_mode(Gtk::SELECTION_NONE);
+ m_flow_box.set_selection_mode(Gtk::SelectionMode::NONE);
m_flow_box.set_homogeneous();
// Color swatches
diff --git a/examples/book/frame/examplewindow.cc b/examples/book/frame/examplewindow.cc
index 55946ad..c5f5699 100644
--- a/examples/book/frame/examplewindow.cc
+++ b/examples/book/frame/examplewindow.cc
@@ -31,10 +31,10 @@ ExampleWindow::ExampleWindow()
m_Frame.set_label("Gtk::Frame Widget");
/* Align the label at the right of the frame */
- //m_Frame.set_label_align(Gtk::ALIGN_END, Gtk::ALIGN_START);
+ //m_Frame.set_label_align(Gtk::Align::END, Gtk::Align::START);
/* Set the style of the frame */
- m_Frame.set_shadow_type(Gtk::SHADOW_ETCHED_OUT);
+ m_Frame.set_shadow_type(Gtk::ShadowType::ETCHED_OUT);
}
ExampleWindow::~ExampleWindow()
diff --git a/examples/book/giomm/monitor_directory/monitor_directory.cc
b/examples/book/giomm/monitor_directory/monitor_directory.cc
index 11bdf62..5d65a1f 100644
--- a/examples/book/giomm/monitor_directory/monitor_directory.cc
+++ b/examples/book/giomm/monitor_directory/monitor_directory.cc
@@ -41,25 +41,25 @@ on_directory_changed(const Glib::RefPtr<Gio::File>& file,
switch(event)
{
- case Gio::FILE_MONITOR_EVENT_CHANGED:
+ case Gio::FileMonitorEvent::CHANGED:
std::cout << "Event: A file is being changed" << std::endl;
break;
- case Gio::FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+ case Gio::FileMonitorEvent::CHANGES_DONE_HINT:
std::cout << "Event: File changes are done" << std::endl;
break;
- case Gio::FILE_MONITOR_EVENT_DELETED:
+ case Gio::FileMonitorEvent::DELETED:
std::cout << "Event: A file was deleted" << std::endl;
break;
- case Gio::FILE_MONITOR_EVENT_CREATED:
+ case Gio::FileMonitorEvent::CREATED:
std::cout << "Event: A file was created" << std::endl;
break;
- case Gio::FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
+ case Gio::FileMonitorEvent::ATTRIBUTE_CHANGED:
std::cout << "Event: A file attribute was changed" << std::endl;
break;
- case Gio::FILE_MONITOR_EVENT_PRE_UNMOUNT:
+ case Gio::FileMonitorEvent::PRE_UNMOUNT:
std::cout << "Event: pre-unmount event" << std::endl;
break;
- case Gio::FILE_MONITOR_EVENT_UNMOUNTED:
+ case Gio::FileMonitorEvent::UNMOUNTED:
std::cout << "Event: unmounted" << std::endl;
break;
default:
diff --git a/examples/book/giomm/usage/usage.cc b/examples/book/giomm/usage/usage.cc
index c436065..e4fb242 100644
--- a/examples/book/giomm/usage/usage.cc
+++ b/examples/book/giomm/usage/usage.cc
@@ -29,7 +29,7 @@ static goffset get_size_recursively(const Glib::RefPtr<Gio::File>& file)
try
{
auto info = file->query_info();
- if(info->get_file_type() == Gio::FILE_TYPE_DIRECTORY)
+ if(info->get_file_type() == Gio::FileType::DIRECTORY)
{
auto children = file->enumerate_children();
Glib::RefPtr<Gio::FileInfo> child_info;
diff --git a/examples/book/grid/examplewindow.cc b/examples/book/grid/examplewindow.cc
index 6c6890c..cd88dc5 100644
--- a/examples/book/grid/examplewindow.cc
+++ b/examples/book/grid/examplewindow.cc
@@ -30,7 +30,7 @@ ExampleWindow::ExampleWindow()
m_grid.add(m_button_1);
m_grid.add(m_button_2);
- m_grid.attach_next_to(m_button_quit, m_button_1, Gtk::POS_BOTTOM, 2, 1);
+ m_grid.attach_next_to(m_button_quit, m_button_1, Gtk::PositionType::BOTTOM, 2, 1);
m_button_1.signal_clicked().connect(
sigc::bind( sigc::mem_fun(*this, &ExampleWindow::on_button_numbered), "button 1") );
diff --git a/examples/book/headerbar/examplewindow.cc b/examples/book/headerbar/examplewindow.cc
index 3fa4ff6..66e22b4 100644
--- a/examples/book/headerbar/examplewindow.cc
+++ b/examples/book/headerbar/examplewindow.cc
@@ -17,15 +17,15 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
- : m_close_button_label("Show close button:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER),
- m_title_label("Title:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER),
- m_subtitle_label("Subtitle:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER)
+ : m_close_button_label("Show close button:", Gtk::Align::END, Gtk::Align::CENTER),
+ m_title_label("Title:", Gtk::Align::END, Gtk::Align::CENTER),
+ m_subtitle_label("Subtitle:", Gtk::Align::END, Gtk::Align::CENTER)
{
// Window properties
set_title("HeaderBar Example");
// Button
- m_button.set_image_from_icon_name("go-home-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+ m_button.set_image_from_icon_name("go-home-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
m_button.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_button_clicked));
// Entries
diff --git a/examples/book/iconview/examplewindow.cc b/examples/book/iconview/examplewindow.cc
index 7d3ca73..b3d5992 100644
--- a/examples/book/iconview/examplewindow.cc
+++ b/examples/book/iconview/examplewindow.cc
@@ -37,7 +37,7 @@ namespace
}
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::IconView (ListStore + TreeModelSort) example");
@@ -50,20 +50,20 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_IconView);
// Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(6);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
// Create the Tree model:
m_refListModel = Gtk::ListStore::create( m_Columns );
- m_refListModel->set_sort_column( m_Columns.m_col_description, Gtk::SORT_ASCENDING );
+ m_refListModel->set_sort_column( m_Columns.m_col_description, Gtk::SortType::ASCENDING );
m_IconView.set_model(m_refListModel);
m_IconView.set_markup_column(m_Columns.m_col_description);
diff --git a/examples/book/idle/idleexample.cc b/examples/book/idle/idleexample.cc
index a47352b..b9d3534 100644
--- a/examples/book/idle/idleexample.cc
+++ b/examples/book/idle/idleexample.cc
@@ -17,7 +17,7 @@
#include "idleexample.h"
IdleExample::IdleExample() :
- m_Box(Gtk::ORIENTATION_VERTICAL, 5),
+ m_Box(Gtk::Orientation::VERTICAL, 5),
m_ButtonQuit("_Quit", true)
{
m_Box.set_margin(5);
@@ -36,7 +36,7 @@ IdleExample::IdleExample() :
m_Box.pack_start( *Gtk::manage(new Gtk::Label("5000 MB")) );
m_Box.pack_start(m_ProgressBar_d);
- auto hbox = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL,10));
+ auto hbox = Gtk::manage( new Gtk::Box(Gtk::Orientation::HORIZONTAL,10));
m_Box.pack_start(*hbox);
hbox->pack_start(m_ButtonQuit, Gtk::PACK_EXPAND_PADDING);
diff --git a/examples/book/infobar/examplewindow.cc b/examples/book/infobar/examplewindow.cc
index 6d8f9b4..a8c2420 100644
--- a/examples/book/infobar/examplewindow.cc
+++ b/examples/book/infobar/examplewindow.cc
@@ -17,7 +17,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL, 6),
+: m_VBox(Gtk::Orientation::VERTICAL, 6),
m_Button_Quit("_Quit", true),
m_Button_Clear("_Clear", true)
{
@@ -47,7 +47,7 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TextView);
// Show the scrollbars only when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
@@ -57,7 +57,7 @@ ExampleWindow::ExampleWindow()
m_ButtonBox.pack_start(m_Button_Clear, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_spacing(6);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
// Connect signals:
m_InfoBar.signal_response().connect(sigc::mem_fun(*this,
@@ -98,7 +98,7 @@ void ExampleWindow::on_button_clear()
{
m_refTextBuffer->set_text("");
m_Message_Label.set_text("Cleared the text.");
- m_InfoBar.set_message_type(Gtk::MESSAGE_INFO);
+ m_InfoBar.set_message_type(Gtk::MessageType::INFO);
m_InfoBar.show();
}
diff --git a/examples/book/input/main.cc b/examples/book/input/main.cc
index 0576fff..29543a5 100644
--- a/examples/book/input/main.cc
+++ b/examples/book/input/main.cc
@@ -29,7 +29,7 @@ Glib::RefPtr<Glib::IOChannel> iochannel;
// and quit the program if the message was 'Q'.
bool MyCallback(Glib::IOCondition io_condition)
{
- if ((io_condition & Glib::IO_IN) == 0) {
+ if ((io_condition & Glib::IOCondition::IN) != Glib::IOCondition::IN) {
std::cerr << "Invalid fifo response" << std::endl;
}
else {
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
}
// connect the signal handler
- Glib::signal_io().connect(sigc::ptr_fun(MyCallback), read_fd, Glib::IO_IN);
+ Glib::signal_io().connect(sigc::ptr_fun(MyCallback), read_fd, Glib::IOCondition::IN);
// Creates a iochannel from the file descriptor
iochannel = Glib::IOChannel::create_from_fd(read_fd);
diff --git a/examples/book/keyboard_events/propagation/examplewindow.cc
b/examples/book/keyboard_events/propagation/examplewindow.cc
index aacd09d..fea781e 100644
--- a/examples/book/keyboard_events/propagation/examplewindow.cc
+++ b/examples/book/keyboard_events/propagation/examplewindow.cc
@@ -28,13 +28,13 @@ ExampleWindow::ExampleWindow()
m_checkbutton_can_propagate.set_active();
// Main Container
- m_container.set_orientation(Gtk::ORIENTATION_VERTICAL);
+ m_container.set_orientation(Gtk::Orientation::VERTICAL);
m_container.add(m_label);
m_container.add(m_entry);
m_container.add(m_checkbutton_can_propagate);
// Events
- add_events(Gdk::KEY_RELEASE_MASK);
+ add_events(Gdk::EventMask::KEY_RELEASE_MASK);
m_entry.signal_key_release_event().connect(
sigc::mem_fun(*this, &ExampleWindow::entryKeyRelease));
diff --git a/examples/book/keyboard_events/simple/examplewindow.cc
b/examples/book/keyboard_events/simple/examplewindow.cc
index 82fce9a..ae88481 100644
--- a/examples/book/keyboard_events/simple/examplewindow.cc
+++ b/examples/book/keyboard_events/simple/examplewindow.cc
@@ -35,7 +35,7 @@ ExampleWindow::ExampleWindow()
// Events.
// We override the default event signal handler.
- add_events(Gdk::KEY_PRESS_MASK);
+ add_events(Gdk::EventMask::KEY_PRESS_MASK);
}
bool ExampleWindow::on_key_press_event(GdkEventKey* key_event)
diff --git a/examples/book/label/examplewindow.cc b/examples/book/label/examplewindow.cc
index c12c6b9..ff22dec 100644
--- a/examples/book/label/examplewindow.cc
+++ b/examples/book/label/examplewindow.cc
@@ -19,9 +19,9 @@
ExampleWindow::ExampleWindow()
:
- m_HBox(Gtk::ORIENTATION_HORIZONTAL, 5),
- m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
- m_VBox2(Gtk::ORIENTATION_VERTICAL, 5),
+ m_HBox(Gtk::Orientation::HORIZONTAL, 5),
+ m_VBox(Gtk::Orientation::VERTICAL, 5),
+ m_VBox2(Gtk::Orientation::VERTICAL, 5),
m_Frame_Normal("Normal Label"),
m_Frame_Multi("Multi-line Label"),
m_Frame_Left("Left Justified Label"),
@@ -49,11 +49,11 @@ ExampleWindow::ExampleWindow()
m_Frame_Multi.add(m_Label_Multi);
m_VBox.pack_start(m_Frame_Multi, Gtk::PACK_SHRINK);
- m_Label_Left.set_justify(Gtk::JUSTIFY_LEFT);
+ m_Label_Left.set_justify(Gtk::Justification::LEFT);
m_Frame_Left.add(m_Label_Left);
m_VBox.pack_start(m_Frame_Left, Gtk::PACK_SHRINK);
- m_Label_Right.set_justify(Gtk::JUSTIFY_RIGHT);
+ m_Label_Right.set_justify(Gtk::Justification::RIGHT);
m_Frame_Right.add(m_Label_Right);
m_VBox.pack_start(m_Frame_Right, Gtk::PACK_SHRINK);
@@ -86,12 +86,12 @@ ExampleWindow::ExampleWindow()
" This is another newer, longer, better "
"paragraph. It is coming to an end, "
"unfortunately.");
- m_Label_FilledWrapped.set_justify(Gtk::JUSTIFY_FILL);
+ m_Label_FilledWrapped.set_justify(Gtk::Justification::FILL);
m_Label_FilledWrapped.set_line_wrap();
m_Frame_FilledWrapped.add(m_Label_FilledWrapped);
m_VBox2.pack_start(m_Frame_FilledWrapped, Gtk::PACK_SHRINK);
- m_Label_Underlined.set_justify(Gtk::JUSTIFY_LEFT);
+ m_Label_Underlined.set_justify(Gtk::Justification::LEFT);
m_Label_Underlined.set_pattern (
"_________________________ _ _________ _ ______"
" __ _______ ___");
diff --git a/examples/book/listbox/examplewindow.cc b/examples/book/listbox/examplewindow.cc
index 0f7386d..ff2232c 100644
--- a/examples/book/listbox/examplewindow.cc
+++ b/examples/book/listbox/examplewindow.cc
@@ -26,24 +26,24 @@ struct SelectionModeStruct
const SelectionModeStruct selectionModes[] =
{
- { Gtk::SELECTION_NONE, "SELECTION_NONE" },
- { Gtk::SELECTION_SINGLE, "SELECTION_SINGLE" },
- { Gtk::SELECTION_BROWSE, "SELECTION_BROWSE" }
+ { Gtk::SelectionMode::NONE, "SelectionMode::NONE" },
+ { Gtk::SelectionMode::SINGLE, "SelectionMode::SINGLE" },
+ { Gtk::SelectionMode::BROWSE, "SelectionMode::BROWSE" }
};
} // anonymous namespace
ExampleWindow::ExampleWindow() :
- m_HBox(Gtk::ORIENTATION_HORIZONTAL),
- m_VBox1(Gtk::ORIENTATION_VERTICAL),
- m_VBox2(Gtk::ORIENTATION_VERTICAL),
+ m_HBox(Gtk::Orientation::HORIZONTAL),
+ m_VBox1(Gtk::Orientation::VERTICAL),
+ m_VBox2(Gtk::Orientation::VERTICAL),
m_ListBox(),
m_ComboBox(/* has_entry= */ false),
m_CheckButton_SingleClick("single click mode", /* mnemonic= */ false),
m_ScrolledWindow(),
m_Row3("blah3", 3),
- m_VBox_Row(Gtk::ORIENTATION_VERTICAL),
- m_HBox_Row(Gtk::ORIENTATION_HORIZONTAL),
+ m_VBox_Row(Gtk::Orientation::VERTICAL),
+ m_HBox_Row(Gtk::Orientation::HORIZONTAL),
m_Label_Row("a check box"),
m_CheckButton_Row1(),
m_CheckButton_Row2(),
@@ -91,7 +91,7 @@ ExampleWindow::ExampleWindow() :
m_VBox1.pack_start(m_CheckButton_SingleClick, Gtk::PACK_SHRINK);
// Put the ListBox in a ScrolledWindow.
- m_ScrolledWindow.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
m_ScrolledWindow.add(m_ListBox);
m_HBox.pack_start(m_ScrolledWindow, Gtk::PACK_SHRINK);
@@ -118,7 +118,7 @@ ExampleWindow::ExampleWindow() :
row = Gtk::manage(new ExampleRow("", 0));
m_Button_Row2.set_hexpand(false);
- m_Button_Row2.set_halign(Gtk::ALIGN_START);
+ m_Button_Row2.set_halign(Gtk::Align::START);
row->add(m_Button_Row2);
m_ListBox.append(*row);
@@ -248,7 +248,7 @@ void ExampleWindow::update_header_func(Gtk::ListBoxRow* row, Gtk::ListBoxRow* be
// Create header if needed.
if (!row->get_header())
{
- auto hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
+ auto hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL));
auto label = Gtk::manage(new Gtk::Label("Header"));
hbox->pack_start(*label, Gtk::PACK_SHRINK);
auto button = Gtk::manage(new Gtk::Button("button"));
diff --git a/examples/book/listmodel/examplewindow.cc b/examples/book/listmodel/examplewindow.cc
index 316d6ef..3906161 100644
--- a/examples/book/listmodel/examplewindow.cc
+++ b/examples/book/listmodel/examplewindow.cc
@@ -46,7 +46,7 @@ m_button_quit("_Quit", true)
std::cout << "Using bind_" << (use_bind_model ? "model" : "list_store") << std::endl;
// A ListBox to the left.
- m_scrolled_window_list_box.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_scrolled_window_list_box.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_scrolled_window_list_box.set_hexpand(true);
m_scrolled_window_list_box.set_vexpand(true);
m_grid.attach(m_scrolled_window_list_box, 0, 0, 1 ,1);
@@ -57,7 +57,7 @@ m_button_quit("_Quit", true)
m_list_box.bind_list_store(m_store, sigc::ptr_fun(&ExampleWindow::on_create_widget2));
// A FlowBox to the right.
- m_scrolled_window_flow_box.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_scrolled_window_flow_box.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_scrolled_window_flow_box.set_hexpand(true);
m_scrolled_window_flow_box.set_vexpand(true);
m_grid.attach(m_scrolled_window_flow_box, 1, 0, 1 ,1);
@@ -87,7 +87,7 @@ Gtk::Widget* ExampleWindow::on_create_widget1(const Glib::RefPtr<Glib::Object>&
}
auto label = Gtk::manage(new Gtk::Label());
Glib::Binding::bind_property(obj->property_label(), label->property_label(),
- Glib::BINDING_SYNC_CREATE);
+ Glib::BindingFlags::SYNC_CREATE);
return label;
}
@@ -101,7 +101,7 @@ Gtk::Widget* ExampleWindow::on_create_widget2(const Glib::RefPtr<MyObject>& item
}
auto label = Gtk::manage(new Gtk::Label());
Glib::Binding::bind_property(item->property_label(), label->property_label(),
- Glib::BINDING_SYNC_CREATE);
+ Glib::BindingFlags::SYNC_CREATE);
return label;
}
diff --git a/examples/book/menus/main_menu/examplewindow.cc b/examples/book/menus/main_menu/examplewindow.cc
index 45ebc74..212b363 100644
--- a/examples/book/menus/main_menu/examplewindow.cc
+++ b/examples/book/menus/main_menu/examplewindow.cc
@@ -19,7 +19,7 @@
ExampleWindow::ExampleWindow()
: Gtk::ApplicationWindow(),
- m_Box(Gtk::ORIENTATION_VERTICAL)
+ m_Box(Gtk::Orientation::VERTICAL)
{
set_title("Main menu example");
set_default_size(300, 100);
diff --git a/examples/book/menus/popup/examplewindow.cc b/examples/book/menus/popup/examplewindow.cc
index 8e9b5cd..19a10a4 100644
--- a/examples/book/menus/popup/examplewindow.cc
+++ b/examples/book/menus/popup/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_Box(Gtk::ORIENTATION_VERTICAL),
+: m_Box(Gtk::Orientation::VERTICAL),
m_Label("Right-click to see the popup menu."),
m_pMenuPopup(nullptr)
{
diff --git a/examples/book/menus_and_toolbars/examplewindow.cc
b/examples/book/menus_and_toolbars/examplewindow.cc
index 98d5b83..622b1e8 100644
--- a/examples/book/menus_and_toolbars/examplewindow.cc
+++ b/examples/book/menus_and_toolbars/examplewindow.cc
@@ -19,7 +19,7 @@
#include <iostream>
ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
-: m_Box(Gtk::ORIENTATION_VERTICAL)
+: m_Box(Gtk::Orientation::VERTICAL)
{
set_title("main_menu example");
set_default_size(200, 200);
diff --git a/examples/book/multithread/examplewindow.cc b/examples/book/multithread/examplewindow.cc
index 9b50ed8..11e1fa5 100644
--- a/examples/book/multithread/examplewindow.cc
+++ b/examples/book/multithread/examplewindow.cc
@@ -17,8 +17,8 @@
#include <iostream>
ExampleWindow::ExampleWindow() :
- m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
- m_ButtonBox(Gtk::ORIENTATION_HORIZONTAL),
+ m_VBox(Gtk::Orientation::VERTICAL, 5),
+ m_ButtonBox(Gtk::Orientation::HORIZONTAL),
m_ButtonStart("Start work"),
m_ButtonStop("Stop work"),
m_ButtonQuit("_Quit", /* mnemonic= */ true),
@@ -45,7 +45,7 @@ ExampleWindow::ExampleWindow() :
m_ScrolledWindow.add(m_TextView);
// Only show the scrollbars when they are necessary.
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
@@ -59,7 +59,7 @@ ExampleWindow::ExampleWindow() :
m_ButtonBox.pack_start(m_ButtonQuit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_spacing(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
// Connect the signal handlers to the buttons.
m_ButtonStart.signal_clicked().connect(sigc::mem_fun(*this, &ExampleWindow::on_start_button_clicked));
diff --git a/examples/book/notebook/examplewindow.cc b/examples/book/notebook/examplewindow.cc
index bcb4432..beb9fbd 100644
--- a/examples/book/notebook/examplewindow.cc
+++ b/examples/book/notebook/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Label1("Contents of tab 1"),
m_Label2("Contents of tab 2"),
m_Button_Quit("Quit")
diff --git a/examples/book/paned/examplewindow.cc b/examples/book/paned/examplewindow.cc
index ecc2c30..4c5a1d9 100644
--- a/examples/book/paned/examplewindow.cc
+++ b/examples/book/paned/examplewindow.cc
@@ -17,7 +17,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VPaned(Gtk::ORIENTATION_VERTICAL)
+: m_VPaned(Gtk::Orientation::VERTICAL)
{
set_title ("Paned Windows");
set_default_size(450, 400);
diff --git a/examples/book/paned/messageslist.cc b/examples/book/paned/messageslist.cc
index 14a8d9b..e0baac5 100644
--- a/examples/book/paned/messageslist.cc
+++ b/examples/book/paned/messageslist.cc
@@ -20,7 +20,7 @@
MessagesList::MessagesList()
{
/* Create a new scrolled window, with scrollbars only if needed */
- set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
add(m_TreeView);
diff --git a/examples/book/paned/messagetext.cc b/examples/book/paned/messagetext.cc
index e936c81..b2e623a 100644
--- a/examples/book/paned/messagetext.cc
+++ b/examples/book/paned/messagetext.cc
@@ -18,7 +18,7 @@
MessageText::MessageText()
{
- set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
add(m_TextView);
insert_text();
diff --git a/examples/book/placessidebar/examplewindow.cc b/examples/book/placessidebar/examplewindow.cc
index d2653f1..2e0ef1a 100644
--- a/examples/book/placessidebar/examplewindow.cc
+++ b/examples/book/placessidebar/examplewindow.cc
@@ -17,7 +17,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_hbox(Gtk::ORIENTATION_HORIZONTAL, 6),
+: m_hbox(Gtk::Orientation::HORIZONTAL, 6),
m_show_desktop_check("Show \"Desktop\""),
m_show_enter_location("Show \"Enter Location\"")
{
@@ -26,7 +26,7 @@ ExampleWindow::ExampleWindow()
set_size_request(500, 600);
// Options
- m_controls_frame.set_shadow_type(Gtk::SHADOW_NONE);
+ m_controls_frame.set_shadow_type(Gtk::ShadowType::NONE);
m_frame_label.set_markup("<b>Options</b>");
m_controls_frame.set_label_widget(m_frame_label);
m_controls.set_margin_top(6);
@@ -83,20 +83,20 @@ void ExampleWindow::on_placessidebar_open_location(const Glib::RefPtr<Gio::File>
{
Gtk::MessageDialog dialog(*this, "<b>open-location</b> event triggered", true);
Gtk::Grid location_information_grid;
- Gtk::Label basename_label("Basename:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
- Gtk::Label path_label("Path:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
- Gtk::Label uri_label("URI:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
+ Gtk::Label basename_label("Basename:", Gtk::Align::END, Gtk::Align::CENTER);
+ Gtk::Label path_label("Path:", Gtk::Align::END, Gtk::Align::CENTER);
+ Gtk::Label uri_label("URI:", Gtk::Align::END, Gtk::Align::CENTER);
Gtk::Label file_basename_label, file_path_label, file_uri_label;
file_basename_label.set_text(location->get_basename());
- file_basename_label.set_halign(Gtk::ALIGN_START);
- file_basename_label.set_valign(Gtk::ALIGN_CENTER);
+ file_basename_label.set_halign(Gtk::Align::START);
+ file_basename_label.set_valign(Gtk::Align::CENTER);
file_path_label.set_text(location->get_path());
- file_path_label.set_halign(Gtk::ALIGN_START);
- file_path_label.set_valign(Gtk::ALIGN_CENTER);
+ file_path_label.set_halign(Gtk::Align::START);
+ file_path_label.set_valign(Gtk::Align::CENTER);
file_uri_label.set_text(location->get_uri());
- file_uri_label.set_halign(Gtk::ALIGN_START);
- file_uri_label.set_valign(Gtk::ALIGN_CENTER);
+ file_uri_label.set_halign(Gtk::Align::START);
+ file_uri_label.set_valign(Gtk::Align::CENTER);
location_information_grid.attach(basename_label, 0, 0, 1, 1);
location_information_grid.attach(file_basename_label, 1, 0, 1, 1);
@@ -144,7 +144,7 @@ void ExampleWindow::on_menu_properties_activate()
{
auto selected_item = m_places_sidebar.get_location();
- on_placessidebar_open_location(selected_item, Gtk::PLACES_OPEN_NORMAL);
+ on_placessidebar_open_location(selected_item, Gtk::PlacesOpenFlags::NORMAL);
}
diff --git a/examples/book/popover/examplewindow.cc b/examples/book/popover/examplewindow.cc
index 66948b6..ec8fab0 100644
--- a/examples/book/popover/examplewindow.cc
+++ b/examples/book/popover/examplewindow.cc
@@ -17,7 +17,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
- : m_format_buttons_box(Gtk::ORIENTATION_HORIZONTAL),
+ : m_format_buttons_box(Gtk::Orientation::HORIZONTAL),
m_toggle_button("Button"),
m_toggle_form_popover(m_toggle_button),
m_toggle_form_label("Non-modal Popover"),
@@ -73,16 +73,16 @@ void ExampleWindow::configure_form_popover()
m_toggle_form_grid.attach(m_toggle_form_combo, 1, 2, 1, 1);
m_toggle_form_popover.add(m_toggle_form_grid);
- m_toggle_form_popover.set_position(Gtk::POS_BOTTOM);
+ m_toggle_form_popover.set_position(Gtk::PositionType::BOTTOM);
m_toggle_form_popover.set_margin(6);
m_toggle_form_popover.set_modal(false);
}
void ExampleWindow::configure_form_buttons()
{
- m_toggle_form_buttons[0].set_image_from_icon_name("format-justify-left-symbolic", Gtk::ICON_SIZE_BUTTON,
true);
- m_toggle_form_buttons[1].set_image_from_icon_name("format-justify-center-symbolic", Gtk::ICON_SIZE_BUTTON,
true);
- m_toggle_form_buttons[2].set_image_from_icon_name("format-justify-right-symbolic", Gtk::ICON_SIZE_BUTTON,
true);
+ m_toggle_form_buttons[0].set_image_from_icon_name("format-justify-left-symbolic",
Gtk::BuiltinIconSize::BUTTON, true);
+ m_toggle_form_buttons[1].set_image_from_icon_name("format-justify-center-symbolic",
Gtk::BuiltinIconSize::BUTTON, true);
+ m_toggle_form_buttons[2].set_image_from_icon_name("format-justify-right-symbolic",
Gtk::BuiltinIconSize::BUTTON, true);
m_toggle_form_buttons[0].set_draw_indicator(false);
m_toggle_form_buttons[1].set_draw_indicator(false);
@@ -119,11 +119,11 @@ void ExampleWindow::on_combo_changed()
if (active_entry == 0)
{
- m_toggle_form_popover.set_position(Gtk::POS_BOTTOM);
+ m_toggle_form_popover.set_position(Gtk::PositionType::BOTTOM);
}
else if (active_entry == 1)
{
- m_toggle_form_popover.set_position(Gtk::POS_RIGHT);
+ m_toggle_form_popover.set_position(Gtk::PositionType::RIGHT);
}
}
diff --git a/examples/book/printing/advanced/examplewindow.cc
b/examples/book/printing/advanced/examplewindow.cc
index 65ee26e..504ce6e 100644
--- a/examples/book/printing/advanced/examplewindow.cc
+++ b/examples/book/printing/advanced/examplewindow.cc
@@ -23,7 +23,7 @@
const Glib::ustring app_title = "gtkmm Printing Example";
ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_NameLabel("Name"),
m_SurnameLabel("Surname"),
m_CommentsLabel("Comments")
@@ -55,7 +55,7 @@ ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
m_ScrolledWindow.add(m_TextView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_Grid.attach(m_CommentsLabel, 0, 2);
m_Grid.attach(m_ScrolledWindow, 1, 2);
@@ -262,13 +262,13 @@ void ExampleWindow::on_printoperation_done(Gtk::PrintOperationResult result)
{
//Printing is "done" when the print data is spooled.
- if (result == Gtk::PRINT_OPERATION_RESULT_ERROR)
+ if (result == Gtk::PrintOperationResult::ERROR)
{
Gtk::MessageDialog err_dialog(*this, "Error printing form", false,
- Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
+ Gtk::MessageType::ERROR, Gtk::ButtonsType::OK, true);
err_dialog.run();
}
- else if (result == Gtk::PRINT_OPERATION_RESULT_APPLY)
+ else if (result == Gtk::PrintOperationResult::APPLY)
{
//Update PrintSettings with the ones used in this PrintOperation:
m_refSettings = m_refPrintFormOperation->get_print_settings();
@@ -335,12 +335,12 @@ void ExampleWindow::on_menu_file_page_setup()
void ExampleWindow::on_menu_file_print_preview()
{
- print_or_preview(Gtk::PRINT_OPERATION_ACTION_PREVIEW);
+ print_or_preview(Gtk::PrintOperationAction::PREVIEW);
}
void ExampleWindow::on_menu_file_print()
{
- print_or_preview(Gtk::PRINT_OPERATION_ACTION_PRINT_DIALOG);
+ print_or_preview(Gtk::PrintOperationAction::PRINT_DIALOG);
}
void ExampleWindow::on_menu_file_quit()
diff --git a/examples/book/printing/advanced/previewdialog.cc
b/examples/book/printing/advanced/previewdialog.cc
index 22d2ffa..dc4bb5b 100644
--- a/examples/book/printing/advanced/previewdialog.cc
+++ b/examples/book/printing/advanced/previewdialog.cc
@@ -27,7 +27,7 @@ PreviewDialog::PreviewDialog(
: m_pOperation(pfo),
m_refPreview(preview),
m_refPrintContext(print_ctx),
- m_VBox(Gtk::ORIENTATION_VERTICAL),
+ m_VBox(Gtk::Orientation::VERTICAL),
m_SpinAdjustment( Gtk::Adjustment::create(1, 100, 1) ), //Used to construct m_PageSpin
m_PageSpin(m_SpinAdjustment, 1, 0),
m_CloseButton("_Close", true),
@@ -127,8 +127,8 @@ void PreviewDialog::on_popreview_got_page_size(
{
const auto paper_size = page_setup->get_paper_size();
- const double width = paper_size.get_width(Gtk::UNIT_INCH);
- const double height = paper_size.get_height(Gtk::UNIT_INCH);
+ const double width = paper_size.get_width(Gtk::Unit::INCH);
+ const double height = paper_size.get_height(Gtk::Unit::INCH);
if(m_DrawingArea.get_realized()) //Avoid getting an odd allocation.
{
diff --git a/examples/book/printing/advanced/printformoperation.cc
b/examples/book/printing/advanced/printformoperation.cc
index 9cf5fa6..72938d0 100644
--- a/examples/book/printing/advanced/printformoperation.cc
+++ b/examples/book/printing/advanced/printformoperation.cc
@@ -154,10 +154,10 @@ Gtk::Widget* PrintFormOperation::on_create_custom_widget()
//Create a custom tab in the print dialog titled "Other"
set_custom_tab_label("Other");
- auto vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
+ auto vbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL));
vbox->set_margin(12);
- auto hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 8));
+ auto hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 8));
vbox->pack_start(*hbox, false, false);
hbox->set_margin(6);
diff --git a/examples/book/printing/simple/examplewindow.cc b/examples/book/printing/simple/examplewindow.cc
index 65ee26e..504ce6e 100644
--- a/examples/book/printing/simple/examplewindow.cc
+++ b/examples/book/printing/simple/examplewindow.cc
@@ -23,7 +23,7 @@
const Glib::ustring app_title = "gtkmm Printing Example";
ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_NameLabel("Name"),
m_SurnameLabel("Surname"),
m_CommentsLabel("Comments")
@@ -55,7 +55,7 @@ ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
m_ScrolledWindow.add(m_TextView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_Grid.attach(m_CommentsLabel, 0, 2);
m_Grid.attach(m_ScrolledWindow, 1, 2);
@@ -262,13 +262,13 @@ void ExampleWindow::on_printoperation_done(Gtk::PrintOperationResult result)
{
//Printing is "done" when the print data is spooled.
- if (result == Gtk::PRINT_OPERATION_RESULT_ERROR)
+ if (result == Gtk::PrintOperationResult::ERROR)
{
Gtk::MessageDialog err_dialog(*this, "Error printing form", false,
- Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
+ Gtk::MessageType::ERROR, Gtk::ButtonsType::OK, true);
err_dialog.run();
}
- else if (result == Gtk::PRINT_OPERATION_RESULT_APPLY)
+ else if (result == Gtk::PrintOperationResult::APPLY)
{
//Update PrintSettings with the ones used in this PrintOperation:
m_refSettings = m_refPrintFormOperation->get_print_settings();
@@ -335,12 +335,12 @@ void ExampleWindow::on_menu_file_page_setup()
void ExampleWindow::on_menu_file_print_preview()
{
- print_or_preview(Gtk::PRINT_OPERATION_ACTION_PREVIEW);
+ print_or_preview(Gtk::PrintOperationAction::PREVIEW);
}
void ExampleWindow::on_menu_file_print()
{
- print_or_preview(Gtk::PRINT_OPERATION_ACTION_PRINT_DIALOG);
+ print_or_preview(Gtk::PrintOperationAction::PRINT_DIALOG);
}
void ExampleWindow::on_menu_file_quit()
diff --git a/examples/book/progressbar/examplewindow.cc b/examples/book/progressbar/examplewindow.cc
index 71f8165..044493f 100644
--- a/examples/book/progressbar/examplewindow.cc
+++ b/examples/book/progressbar/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
+: m_VBox(Gtk::Orientation::VERTICAL, 5),
m_CheckButton_Text("Show text"),
m_CheckButton_Activity("Activity mode"),
m_CheckButton_Inverted("Right to Left"),
@@ -32,8 +32,8 @@ ExampleWindow::ExampleWindow()
add(m_VBox);
m_VBox.pack_start(m_ProgressBar, Gtk::PACK_SHRINK, 5);
- m_ProgressBar.set_halign(Gtk::ALIGN_CENTER);
- m_ProgressBar.set_valign(Gtk::ALIGN_CENTER);
+ m_ProgressBar.set_halign(Gtk::Align::CENTER);
+ m_ProgressBar.set_valign(Gtk::Align::CENTER);
m_ProgressBar.set_size_request(100, -1);
m_ProgressBar.set_text("some text");
m_ProgressBar.set_show_text(false);
diff --git a/examples/book/range_widgets/examplewindow.cc b/examples/book/range_widgets/examplewindow.cc
index c093615..e0bc463 100644
--- a/examples/book/range_widgets/examplewindow.cc
+++ b/examples/book/range_widgets/examplewindow.cc
@@ -19,13 +19,13 @@
ExampleWindow::ExampleWindow()
:
- m_VBox_Top(Gtk::ORIENTATION_VERTICAL, 0),
- m_VBox2(Gtk::ORIENTATION_VERTICAL, 20),
- m_VBox_HScale(Gtk::ORIENTATION_VERTICAL, 10),
- m_HBox_Scales(Gtk::ORIENTATION_HORIZONTAL, 10),
- m_HBox_Combo(Gtk::ORIENTATION_HORIZONTAL, 10),
- m_HBox_Digits(Gtk::ORIENTATION_HORIZONTAL, 10),
- m_HBox_PageSize(Gtk::ORIENTATION_HORIZONTAL, 10),
+ m_VBox_Top(Gtk::Orientation::VERTICAL, 0),
+ m_VBox2(Gtk::Orientation::VERTICAL, 20),
+ m_VBox_HScale(Gtk::Orientation::VERTICAL, 10),
+ m_HBox_Scales(Gtk::Orientation::HORIZONTAL, 10),
+ m_HBox_Combo(Gtk::Orientation::HORIZONTAL, 10),
+ m_HBox_Digits(Gtk::Orientation::HORIZONTAL, 10),
+ m_HBox_PageSize(Gtk::Orientation::HORIZONTAL, 10),
// Value, lower, upper, step_increment, page_increment, page_size:
// Note that the page_size value only makes a difference for
@@ -35,8 +35,8 @@ ExampleWindow::ExampleWindow()
m_adjustment_digits( Gtk::Adjustment::create(1.0, 0.0, 5.0, 1.0, 2.0) ),
m_adjustment_pagesize( Gtk::Adjustment::create(1.0, 1.0, 101.0) ),
- m_VScale(m_adjustment, Gtk::ORIENTATION_VERTICAL),
- m_HScale(m_adjustment, Gtk::ORIENTATION_HORIZONTAL),
+ m_VScale(m_adjustment, Gtk::Orientation::VERTICAL),
+ m_HScale(m_adjustment, Gtk::Orientation::HORIZONTAL),
m_Scale_Digits(m_adjustment_digits),
m_Scale_PageSize(m_adjustment_pagesize),
@@ -55,13 +55,13 @@ ExampleWindow::ExampleWindow()
//VScale:
m_VScale.set_digits(1);
- m_VScale.set_value_pos(Gtk::POS_TOP);
+ m_VScale.set_value_pos(Gtk::PositionType::TOP);
m_VScale.set_draw_value();
m_VScale.set_inverted(); // highest value at top
//HScale:
m_HScale.set_digits(1);
- m_HScale.set_value_pos(Gtk::POS_TOP);
+ m_HScale.set_value_pos(Gtk::PositionType::TOP);
m_HScale.set_draw_value();
add(m_VBox_Top);
@@ -92,16 +92,16 @@ ExampleWindow::ExampleWindow()
//Fill the ComboBox's Tree Model:
auto row = *(m_refTreeModel->append());
- row[m_Columns.m_col_position_type] = Gtk::POS_TOP;
+ row[m_Columns.m_col_position_type] = Gtk::PositionType::TOP;
row[m_Columns.m_col_title] = "Top";
row = *(m_refTreeModel->append());
- row[m_Columns.m_col_position_type] = Gtk::POS_BOTTOM;
+ row[m_Columns.m_col_position_type] = Gtk::PositionType::BOTTOM;
row[m_Columns.m_col_title] = "Bottom";
row = *(m_refTreeModel->append());
- row[m_Columns.m_col_position_type] = Gtk::POS_LEFT;
+ row[m_Columns.m_col_position_type] = Gtk::PositionType::LEFT;
row[m_Columns.m_col_title] = "Left";
row = *(m_refTreeModel->append());
- row[m_Columns.m_col_position_type] = Gtk::POS_RIGHT;
+ row[m_Columns.m_col_position_type] = Gtk::PositionType::RIGHT;
row[m_Columns.m_col_title] = "Right";
m_VBox2.pack_start(m_HBox_Combo, Gtk::PACK_SHRINK);
diff --git a/examples/book/recent_files/examplewindow.cc b/examples/book/recent_files/examplewindow.cc
index af18e51..c70b856 100644
--- a/examples/book/recent_files/examplewindow.cc
+++ b/examples/book/recent_files/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow(const Glib::RefPtr<Gtk::Application>& app)
-: m_Box(Gtk::ORIENTATION_VERTICAL),
+: m_Box(Gtk::Orientation::VERTICAL),
m_refRecentManager(Gtk::RecentManager::get_default())
{
set_title("recent files example");
@@ -156,12 +156,12 @@ void ExampleWindow::on_menu_file_quit()
void ExampleWindow::on_menu_file_recent_files_dialog()
{
Gtk::RecentChooserDialog dialog(*this, "Recent Files", m_refRecentManager);
- dialog.add_button("Select File", Gtk::RESPONSE_OK);
- dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL);
+ dialog.add_button("Select File", Gtk::ResponseType::OK);
+ dialog.add_button("_Cancel", Gtk::ResponseType::CANCEL);
const int response = dialog.run();
dialog.hide();
- if(response == Gtk::RESPONSE_OK)
+ if(response == Gtk::ResponseType::OK)
{
std::cout << "URI selected = " << dialog.get_current_uri() << std::endl;
}
diff --git a/examples/book/revealer/examplewindow.cc b/examples/book/revealer/examplewindow.cc
index c3be5db..bdc1d0a 100644
--- a/examples/book/revealer/examplewindow.cc
+++ b/examples/book/revealer/examplewindow.cc
@@ -17,12 +17,12 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_vbox(Gtk::ORIENTATION_VERTICAL),
+: m_vbox(Gtk::Orientation::VERTICAL),
m_label("A child widget."),
- m_transition_type_label("Transition type:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER),
+ m_transition_type_label("Transition type:", Gtk::Align::END, Gtk::Align::CENTER),
m_transition_duration(1.0, 0),
- m_transition_duration_label("Duration (in ms):", Gtk::ALIGN_END, Gtk::ALIGN_CENTER),
- m_switch_label("Reveal child:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER)
+ m_transition_duration_label("Duration (in ms):", Gtk::Align::END, Gtk::Align::CENTER),
+ m_switch_label("Reveal child:", Gtk::Align::END, Gtk::Align::CENTER)
{
// Window properties
set_title("Revealer Example");
@@ -88,29 +88,29 @@ void ExampleWindow::on_switch_active_changed()
Gtk::RevealerTransitionType ExampleWindow::get_selected_transition_type()
{
- auto transition_type = Gtk::REVEALER_TRANSITION_TYPE_NONE;
+ auto transition_type = Gtk::RevealerTransitionType::NONE;
const int active_row = m_transition_type.get_active_row_number();
switch (active_row)
{
case 0:
default:
- transition_type = Gtk::REVEALER_TRANSITION_TYPE_NONE;
+ transition_type = Gtk::RevealerTransitionType::NONE;
break;
case 1:
- transition_type = Gtk::REVEALER_TRANSITION_TYPE_CROSSFADE;
+ transition_type = Gtk::RevealerTransitionType::CROSSFADE;
break;
case 2:
- transition_type = Gtk::REVEALER_TRANSITION_TYPE_SLIDE_RIGHT;
+ transition_type = Gtk::RevealerTransitionType::SLIDE_RIGHT;
break;
case 3:
- transition_type = Gtk::REVEALER_TRANSITION_TYPE_SLIDE_LEFT;
+ transition_type = Gtk::RevealerTransitionType::SLIDE_LEFT;
break;
case 4:
- transition_type = Gtk::REVEALER_TRANSITION_TYPE_SLIDE_UP;
+ transition_type = Gtk::RevealerTransitionType::SLIDE_UP;
break;
case 5:
- transition_type = Gtk::REVEALER_TRANSITION_TYPE_SLIDE_DOWN;
+ transition_type = Gtk::RevealerTransitionType::SLIDE_DOWN;
break;
}
diff --git a/examples/book/scrolledwindow/examplewindow.cc b/examples/book/scrolledwindow/examplewindow.cc
index 9629c56..7dd0719 100644
--- a/examples/book/scrolledwindow/examplewindow.cc
+++ b/examples/book/scrolledwindow/examplewindow.cc
@@ -24,12 +24,12 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.set_margin(10);
- /* the policy is one of Gtk::POLICY AUTOMATIC, or Gtk::POLICY_ALWAYS.
- * Gtk::POLICY_AUTOMATIC will automatically decide whether you need
- * scrollbars, whereas Gtk::POLICY_ALWAYS will always leave the scrollbars
+ /* the policy is one of Gtk::PolicyType::AUTOMATIC, or Gtk::PolicyType::ALWAYS.
+ * Gtk::PolicyType::AUTOMATIC will automatically decide whether you need
+ * scrollbars, whereas Gtk::PolicyType::ALWAYS will always leave the scrollbars
* there. The first one is the horizontal scrollbar, the second,
* the vertical. */
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::ALWAYS);
get_content_area()->pack_start(m_ScrolledWindow);
@@ -54,12 +54,12 @@ ExampleWindow::ExampleWindow()
}
/* Add a "close" button to the bottom of the dialog */
- add_button("_Close", Gtk::RESPONSE_CLOSE);
+ add_button("_Close", Gtk::ResponseType::CLOSE);
signal_response().connect(sigc::mem_fun(*this, &ExampleWindow::on_dialog_response));
/* This makes it so the button is the default.
* Simply hitting the "Enter" key will cause this button to activate. */
- set_default_response(Gtk::RESPONSE_CLOSE);
+ set_default_response(Gtk::ResponseType::CLOSE);
}
ExampleWindow::~ExampleWindow()
@@ -70,8 +70,8 @@ void ExampleWindow::on_dialog_response(int response_id)
{
switch (response_id)
{
- case Gtk::RESPONSE_CLOSE:
- case Gtk::RESPONSE_DELETE_EVENT:
+ case static_cast<int>(Gtk::ResponseType::CLOSE):
+ case static_cast<int>(Gtk::ResponseType::DELETE_EVENT):
hide();
break;
default:
diff --git a/examples/book/searchbar/examplewindow.cc b/examples/book/searchbar/examplewindow.cc
index 0548451..43ec22a 100644
--- a/examples/book/searchbar/examplewindow.cc
+++ b/examples/book/searchbar/examplewindow.cc
@@ -17,12 +17,12 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_vbox(Gtk::ORIENTATION_VERTICAL),
- m_search_box(Gtk::ORIENTATION_HORIZONTAL),
- m_up_down_box(Gtk::ORIENTATION_HORIZONTAL),
+: m_vbox(Gtk::Orientation::VERTICAL),
+ m_search_box(Gtk::Orientation::HORIZONTAL),
+ m_up_down_box(Gtk::Orientation::HORIZONTAL),
m_label("Press any key to start searching"),
- m_search_mode_label("Show search bar:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER),
- m_close_button_label("Show close button:", Gtk::ALIGN_END, Gtk::ALIGN_CENTER)
+ m_search_mode_label("Show search bar:", Gtk::Align::END, Gtk::Align::CENTER),
+ m_close_button_label("Show close button:", Gtk::Align::END, Gtk::Align::CENTER)
{
// Window properties
set_title("SearchBar Example");
@@ -35,7 +35,7 @@ ExampleWindow::ExampleWindow()
m_search_bar.connect_entry(m_entry);
// Events
- add_events(Gdk::KEY_PRESS_MASK);
+ add_events(Gdk::EventMask::KEY_PRESS_MASK);
// Connect signals
signal_key_press_event().connect(sigc::mem_fun(*this, &ExampleWindow::on_window_key_press));
@@ -48,7 +48,7 @@ ExampleWindow::ExampleWindow()
m_close_button_switch.property_active().signal_changed().connect(sigc::mem_fun(*this,
&ExampleWindow::on_show_close_button_changed));
// Options panel layout:
- m_options_grid.set_halign(Gtk::ALIGN_START);
+ m_options_grid.set_halign(Gtk::Align::START);
m_options_grid.set_column_spacing(6);
m_options_grid.attach(m_search_mode_label, 0, 0);
m_options_grid.attach(m_search_mode_switch, 1, 0);
@@ -67,8 +67,8 @@ ExampleWindow::ExampleWindow()
m_up_down_box.get_style_context()->add_class("linked");
// Buttons
- m_go_up_button.set_image_from_icon_name("go-up-symbolic", Gtk::ICON_SIZE_BUTTON, true);
- m_go_down_button.set_image_from_icon_name("go-down-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+ m_go_up_button.set_image_from_icon_name("go-up-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
+ m_go_down_button.set_image_from_icon_name("go-down-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
m_vbox.pack_start(m_search_bar, Gtk::PACK_SHRINK, 6);
m_vbox.pack_start(m_label, Gtk::PACK_SHRINK, 6);
diff --git a/examples/book/spinbutton/examplewindow.cc b/examples/book/spinbutton/examplewindow.cc
index 0167fac..b3b8a42 100644
--- a/examples/book/spinbutton/examplewindow.cc
+++ b/examples/book/spinbutton/examplewindow.cc
@@ -22,19 +22,19 @@ ExampleWindow::ExampleWindow()
:
m_Frame_NotAccelerated("Not accelerated"),
m_Frame_Accelerated("Accelerated"),
- m_VBox_Main(Gtk::ORIENTATION_VERTICAL, 5),
- m_VBox(Gtk::ORIENTATION_VERTICAL),
- m_VBox_Day(Gtk::ORIENTATION_VERTICAL),
- m_VBox_Month(Gtk::ORIENTATION_VERTICAL),
- m_VBox_Year(Gtk::ORIENTATION_VERTICAL),
- m_VBox_Accelerated(Gtk::ORIENTATION_VERTICAL),
- m_VBox_Value(Gtk::ORIENTATION_VERTICAL),
- m_VBox_Digits(Gtk::ORIENTATION_VERTICAL),
- m_Label_Day("Day: ", Gtk::ALIGN_START),
- m_Label_Month("Month: ", Gtk::ALIGN_START),
- m_Label_Year("Year: ", Gtk::ALIGN_START),
- m_Label_Value("Value: ", Gtk::ALIGN_START),
- m_Label_Digits("Digits: ", Gtk::ALIGN_START),
+ m_VBox_Main(Gtk::Orientation::VERTICAL, 5),
+ m_VBox(Gtk::Orientation::VERTICAL),
+ m_VBox_Day(Gtk::Orientation::VERTICAL),
+ m_VBox_Month(Gtk::Orientation::VERTICAL),
+ m_VBox_Year(Gtk::Orientation::VERTICAL),
+ m_VBox_Accelerated(Gtk::Orientation::VERTICAL),
+ m_VBox_Value(Gtk::Orientation::VERTICAL),
+ m_VBox_Digits(Gtk::Orientation::VERTICAL),
+ m_Label_Day("Day: ", Gtk::Align::START),
+ m_Label_Month("Month: ", Gtk::Align::START),
+ m_Label_Year("Year: ", Gtk::Align::START),
+ m_Label_Value("Value: ", Gtk::Align::START),
+ m_Label_Digits("Digits: ", Gtk::Align::START),
m_adjustment_day( Gtk::Adjustment::create(1.0, 1.0, 31.0, 1.0, 5.0, 0.0) ),
m_adjustment_month( Gtk::Adjustment::create(1.0, 1.0, 12.0, 1.0, 5.0, 0.0) ),
m_adjustment_year( Gtk::Adjustment::create(2012.0, 1.0, 2200.0, 1.0, 100.0, 0.0) ),
diff --git a/examples/book/textview/examplewindow.cc b/examples/book/textview/examplewindow.cc
index 75a896d..0a3654e 100644
--- a/examples/book/textview/examplewindow.cc
+++ b/examples/book/textview/examplewindow.cc
@@ -17,7 +17,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("_Quit", true),
m_Button_Buffer1("Use buffer 1"),
m_Button_Buffer2("Use buffer 2")
@@ -32,7 +32,7 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TextView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
@@ -44,7 +44,7 @@ ExampleWindow::ExampleWindow()
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
m_ButtonBox.set_spacing(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
//Connect signals:
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
diff --git a/examples/book/timeout/timerexample.cc b/examples/book/timeout/timerexample.cc
index 6d0e18f..0d1f8b7 100644
--- a/examples/book/timeout/timerexample.cc
+++ b/examples/book/timeout/timerexample.cc
@@ -17,7 +17,7 @@
#include "timerexample.h"
TimerExample::TimerExample() :
- m_Box(Gtk::ORIENTATION_HORIZONTAL, 10),
+ m_Box(Gtk::Orientation::HORIZONTAL, 10),
m_ButtonAddTimer("_Add", true),
m_ButtonDeleteTimer("_Remove", true),
m_ButtonQuit("_Quit", true),
diff --git a/examples/book/toolbar/examplewindow.cc b/examples/book/toolbar/examplewindow.cc
index 359af0e..36869d6 100644
--- a/examples/book/toolbar/examplewindow.cc
+++ b/examples/book/toolbar/examplewindow.cc
@@ -18,7 +18,7 @@
#include <iostream>
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Close("_Close", true)
{
set_title("Gtk::Toolbar example");
@@ -30,7 +30,7 @@ ExampleWindow::ExampleWindow()
//Put a toolbar at the top, and a button underneath:
m_VBox.pack_start(m_Toolbar, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_VBox.pack_end(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Close, Gtk::PACK_SHRINK);
@@ -44,7 +44,7 @@ ExampleWindow::ExampleWindow()
//toolbars together, because toolbar items should just be a way to do what
//is also in a menu.
- m_Toolbar.set_toolbar_style(Gtk::TOOLBAR_BOTH);
+ m_Toolbar.set_toolbar_style(Gtk::ToolbarStyle::BOTH);
auto item = Gtk::manage(new Gtk::ToolButton("Click me"));
//item.set_tooltips(*tooltips, "Toolbar item");
diff --git a/examples/book/toolpalette/canvas.cc b/examples/book/toolpalette/canvas.cc
index d8a519d..2c85053 100644
--- a/examples/book/toolpalette/canvas.cc
+++ b/examples/book/toolpalette/canvas.cc
@@ -87,7 +87,7 @@ bool Canvas::on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context,
m_drop_item->m_y = y;
queue_draw();
- context->drag_status(Gdk::ACTION_COPY, time);
+ context->drag_status(Gdk::DragAction::COPY, time);
}
else
{
@@ -150,7 +150,7 @@ void Canvas::on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context
// rather than due to a request in drag_drop, so we are just
// supposed to call gdk_drag_status (), not actually paste in
// the data.
- context->drag_status(Gdk::ACTION_COPY, time);
+ context->drag_status(Gdk::DragAction::COPY, time);
}
queue_draw();
diff --git a/examples/book/toolpalette/canvas.h b/examples/book/toolpalette/canvas.h
index a1035c7..b4aaded 100644
--- a/examples/book/toolpalette/canvas.h
+++ b/examples/book/toolpalette/canvas.h
@@ -42,8 +42,8 @@ private:
auto icon_theme = Gtk::IconTheme::get_for_screen(canvas->get_screen());
int width = 0;
int height = 0; //ignored
- Gtk::IconSize::lookup(Gtk::ICON_SIZE_DIALOG, width, height);
- this->m_pixbuf = icon_theme->load_icon(icon_name, width, Gtk::ICON_LOOKUP_GENERIC_FALLBACK);
+ Gtk::IconSize::lookup(Gtk::BuiltinIconSize::DIALOG, width, height);
+ this->m_pixbuf = icon_theme->load_icon(icon_name, width, Gtk::IconLookupFlags::GENERIC_FALLBACK);
this->m_x = x;
this->m_y = y;
}
diff --git a/examples/book/toolpalette/examplewindow.cc b/examples/book/toolpalette/examplewindow.cc
index c4de0cf..4c9d217 100644
--- a/examples/book/toolpalette/examplewindow.cc
+++ b/examples/book/toolpalette/examplewindow.cc
@@ -30,7 +30,7 @@ void ExampleWindow::load_icon_items()
int requested_icon_size = 0;
int requested_icon_height = 0; //ignored
- Gtk::IconSize::lookup(Gtk::ICON_SIZE_BUTTON, requested_icon_size, requested_icon_height);
+ Gtk::IconSize::lookup(Gtk::BuiltinIconSize::BUTTON, requested_icon_size, requested_icon_height);
const guint max_icons_per_group = 10;
for (auto iter = contexts.begin(); iter != contexts.end(); ++iter)
@@ -50,7 +50,7 @@ void ExampleWindow::load_icon_items()
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
try
{
- pixbuf = icon_theme->load_icon(icon_name, requested_icon_size, Gtk::ICON_LOOKUP_GENERIC_FALLBACK);
+ pixbuf = icon_theme->load_icon(icon_name, requested_icon_size,
Gtk::IconLookupFlags::GENERIC_FALLBACK);
}
catch (const Gtk::IconThemeError& /* ex */)
{
@@ -179,8 +179,8 @@ void ExampleWindow::load_special_items()
}
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL, 6),
- m_HBox(Gtk::ORIENTATION_HORIZONTAL, 6)
+: m_VBox(Gtk::Orientation::VERTICAL, 6),
+ m_HBox(Gtk::Orientation::HORIZONTAL, 6)
{
set_title("Gtk::ToolPalette example");
set_size_request(600, 600);
@@ -192,10 +192,10 @@ ExampleWindow::ExampleWindow()
m_refTreeModelOrientation = Gtk::ListStore::create(m_ColumnsOrientation);
auto iter = m_refTreeModelOrientation->append();
auto row = *iter;
- row[m_ColumnsOrientation.m_col_value] = Gtk::ORIENTATION_HORIZONTAL;
+ row[m_ColumnsOrientation.m_col_value] = Gtk::Orientation::HORIZONTAL;
row[m_ColumnsOrientation.m_col_name] = "Horizontal";\
row = *(m_refTreeModelOrientation->append());
- row[m_ColumnsOrientation.m_col_value] = Gtk::ORIENTATION_VERTICAL;
+ row[m_ColumnsOrientation.m_col_value] = Gtk::Orientation::VERTICAL;
row[m_ColumnsOrientation.m_col_name] = "Vertical";
m_ComboOrientation.set_model(m_refTreeModelOrientation);
m_VBox.pack_start(m_ComboOrientation, Gtk::PACK_SHRINK);
@@ -208,16 +208,16 @@ ExampleWindow::ExampleWindow()
m_refTreeModelStyle = Gtk::ListStore::create(m_ColumnsStyle);
iter = m_refTreeModelStyle->append();
row = *iter;
- row[m_ColumnsStyle.m_col_value] = Gtk::TOOLBAR_TEXT;
+ row[m_ColumnsStyle.m_col_value] = static_cast<int>(Gtk::ToolbarStyle::TEXT);
row[m_ColumnsStyle.m_col_name] = "Text";\
row = *(m_refTreeModelStyle->append());
- row[m_ColumnsStyle.m_col_value] = Gtk::TOOLBAR_BOTH;
+ row[m_ColumnsStyle.m_col_value] = static_cast<int>(Gtk::ToolbarStyle::BOTH);
row[m_ColumnsStyle.m_col_name] = "Both";
row = *(m_refTreeModelStyle->append());
- row[m_ColumnsStyle.m_col_value] = Gtk::TOOLBAR_BOTH_HORIZ;
+ row[m_ColumnsStyle.m_col_value] = static_cast<int>(Gtk::ToolbarStyle::BOTH_HORIZ);
row[m_ColumnsStyle.m_col_name] = "Both: Horizontal";
row = *(m_refTreeModelStyle->append());
- row[m_ColumnsStyle.m_col_value] = Gtk::TOOLBAR_ICONS;
+ row[m_ColumnsStyle.m_col_value] = static_cast<int>(Gtk::ToolbarStyle::ICONS);
row[m_ColumnsStyle.m_col_name] = "Icons";
row = *(m_refTreeModelStyle->append());
row[m_ColumnsStyle.m_col_value] = -1; // A custom meaning for this demo.
@@ -236,21 +236,21 @@ ExampleWindow::ExampleWindow()
m_VBox.pack_start(m_HBox, Gtk::PACK_EXPAND_WIDGET);
- m_ScrolledWindowPalette.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindowPalette.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
m_ScrolledWindowPalette.set_margin(6);
m_ScrolledWindowPalette.add(m_ToolPalette);
m_HBox.pack_start(m_ScrolledWindowPalette);
on_combo_orientation_changed();
- m_ScrolledWindowCanvas.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
+ m_ScrolledWindowCanvas.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::ALWAYS);
m_ScrolledWindowCanvas.set_margin(6);
m_ScrolledWindowCanvas.add(m_Canvas);
m_ScrolledWindowCanvas.set_size_request(200, -1);
m_HBox.pack_start(m_ScrolledWindowCanvas);
m_ToolPalette.add_drag_dest(m_Canvas,
- Gtk::DEST_DEFAULT_HIGHLIGHT, Gtk::TOOL_PALETTE_DRAG_ITEMS, Gdk::ACTION_COPY);
+ Gtk::DestDefaults::HIGHLIGHT, Gtk::ToolPaletteDragTargets::ITEMS, Gdk::DragAction::COPY);
}
ExampleWindow::~ExampleWindow()
@@ -268,10 +268,10 @@ void ExampleWindow::on_combo_orientation_changed()
m_ToolPalette.set_orientation(value);
- if(value == Gtk::ORIENTATION_HORIZONTAL)
- m_ScrolledWindowPalette.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER);
+ if(value == Gtk::Orientation::HORIZONTAL)
+ m_ScrolledWindowPalette.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::NEVER);
else
- m_ScrolledWindowPalette.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindowPalette.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
}
void ExampleWindow::on_combo_style_changed()
diff --git a/examples/book/tooltips/examplewindow.cc b/examples/book/tooltips/examplewindow.cc
index 9270726..998f368 100644
--- a/examples/book/tooltips/examplewindow.cc
+++ b/examples/book/tooltips/examplewindow.cc
@@ -24,11 +24,11 @@ const Glib::ustring markedup_tip = "<i>Markup</i> in a tooltip.";
ExampleWindow::ExampleWindow()
:
- m_vbox(Gtk::ORIENTATION_VERTICAL, 3),
+ m_vbox(Gtk::Orientation::VERTICAL, 3),
m_checkbutton("Click to alternate markup in tooltip"),
m_label("A label"),
m_button("Custom widget in tooltip window"),
- m_button_tooltip_window(Gtk::WINDOW_POPUP)
+ m_button_tooltip_window(Gtk::WindowType::POPUP)
{
//Set up window and the top-level container:
set_title(app_title);
@@ -74,7 +74,7 @@ void ExampleWindow::prepare_textview()
//Set up a scrolled window:
m_scrolled_window.add(m_text_view);
- m_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_scrolled_window.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_vbox.pack_start(m_scrolled_window);
//Create a text buffer with some text:
@@ -87,7 +87,7 @@ void ExampleWindow::prepare_textview()
//In the tooltip signal handler below, we will show a tooltip
//when mouse pointer is above this tagged text.
m_ref_bold_tag = m_ref_text_buffer->create_tag("bold");
- m_ref_bold_tag->set_property("weight", Pango::WEIGHT_BOLD);
+ m_ref_bold_tag->set_property("weight", Pango::Weight::BOLD);
tags.push_back(m_ref_bold_tag);
@@ -144,7 +144,7 @@ bool ExampleWindow::on_textview_query_tooltip(int x, int y, bool keyboard_toolti
else
{
int mouse_x, mouse_y, trailing;
- m_text_view.window_to_buffer_coords(Gtk::TEXT_WINDOW_TEXT,
+ m_text_view.window_to_buffer_coords(Gtk::TextWindowType::TEXT,
x, y, mouse_x, mouse_y);
m_text_view.get_iter_at_position(iter, trailing, mouse_x, mouse_y);
}
@@ -154,7 +154,7 @@ bool ExampleWindow::on_textview_query_tooltip(int x, int y, bool keyboard_toolti
if (iter.has_tag(m_ref_bold_tag))
{
tooltip->set_markup("<b>Information</b> attached to a text tag");
- tooltip->set_icon_from_icon_name("dialog-information", Gtk::ICON_SIZE_MENU);
+ tooltip->set_icon_from_icon_name("dialog-information", Gtk::BuiltinIconSize::MENU);
}
else
{
diff --git a/examples/book/treeview/combo_renderer/examplewindow.cc
b/examples/book/treeview/combo_renderer/examplewindow.cc
index 86f75db..e629df9 100644
--- a/examples/book/treeview/combo_renderer/examplewindow.cc
+++ b/examples/book/treeview/combo_renderer/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (ListStore) example");
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
diff --git a/examples/book/treeview/drag_and_drop/examplewindow.cc
b/examples/book/treeview/drag_and_drop/examplewindow.cc
index 4f905f3..44c466b 100644
--- a/examples/book/treeview/drag_and_drop/examplewindow.cc
+++ b/examples/book/treeview/drag_and_drop/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("_Quit", true)
{
set_title("Gtk::TreeView (Drag and Drop) example");
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
diff --git a/examples/book/treeview/editable_cells/examplewindow.cc
b/examples/book/treeview/editable_cells/examplewindow.cc
index 6ce1611..d07a856 100644
--- a/examples/book/treeview/editable_cells/examplewindow.cc
+++ b/examples/book/treeview/editable_cells/examplewindow.cc
@@ -23,7 +23,7 @@ using std::sprintf;
using std::strtol;
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit"),
m_validate_retry(false)
{
@@ -37,14 +37,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
@@ -177,7 +177,7 @@ void ExampleWindow::cellrenderer_validated_on_edited(
//Tell the user:
Gtk::MessageDialog dialog(*this,
"The number must be less than 10. Please try again.",
- false, Gtk::MESSAGE_ERROR);
+ false, Gtk::MessageType::ERROR);
dialog.run();
//Start editing again, with the bad text, so that the user can correct it.
diff --git a/examples/book/treeview/filter/examplewindow.cc b/examples/book/treeview/filter/examplewindow.cc
index 81cad64..2c61976 100644
--- a/examples/book/treeview/filter/examplewindow.cc
+++ b/examples/book/treeview/filter/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (TreeModelFilter) example");
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
diff --git a/examples/book/treeview/filter_modify/examplewindow.cc
b/examples/book/treeview/filter_modify/examplewindow.cc
index ab9fbc6..470c386 100644
--- a/examples/book/treeview/filter_modify/examplewindow.cc
+++ b/examples/book/treeview/filter_modify/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (TreeModelFilter) example");
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
diff --git a/examples/book/treeview/list/examplewindow.cc b/examples/book/treeview/list/examplewindow.cc
index d61d14f..a73ce47 100644
--- a/examples/book/treeview/list/examplewindow.cc
+++ b/examples/book/treeview/list/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (ListStore) example");
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
diff --git a/examples/book/treeview/listviewtext/examplewindow.cc
b/examples/book/treeview/listviewtext/examplewindow.cc
index 7fc7d76..5562459 100644
--- a/examples/book/treeview/listviewtext/examplewindow.cc
+++ b/examples/book/treeview/listviewtext/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_ListViewText(3),
m_Button_Quit("Quit")
{
@@ -32,14 +32,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_ListViewText);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
diff --git a/examples/book/treeview/modelsort/examplewindow.cc
b/examples/book/treeview/modelsort/examplewindow.cc
index 791acd9..f312da0 100644
--- a/examples/book/treeview/modelsort/examplewindow.cc
+++ b/examples/book/treeview/modelsort/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (TreeModelSort) example");
@@ -33,8 +33,8 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow2.add(m_TreeView2);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow1.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- m_ScrolledWindow2.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow1.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
+ m_ScrolledWindow2.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow1);
m_VBox.pack_start(m_ScrolledWindow2);
@@ -42,7 +42,7 @@ ExampleWindow::ExampleWindow()
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
@@ -55,12 +55,12 @@ ExampleWindow::ExampleWindow()
//This example shows how to use SortModel to show two views of the same model,
//with different sort columns.
m_refTreeModelSort1 = Gtk::TreeModelSort::create(m_refTreeModel);
- m_refTreeModelSort1->set_sort_column(m_Columns.m_col_id, Gtk::SORT_ASCENDING);
+ m_refTreeModelSort1->set_sort_column(m_Columns.m_col_id, Gtk::SortType::ASCENDING);
m_TreeView1.set_model(m_refTreeModelSort1);
m_refTreeModelSort2 = Gtk::TreeModelSort::create(m_refTreeModel);
m_refTreeModelSort2->set_sort_column(m_Columns.m_col_name,
- Gtk::SORT_ASCENDING);
+ Gtk::SortType::ASCENDING);
m_TreeView2.set_model(m_refTreeModelSort2);
diff --git a/examples/book/treeview/popup/examplewindow.cc b/examples/book/treeview/popup/examplewindow.cc
index a2da5cf..8a7fc91 100644
--- a/examples/book/treeview/popup/examplewindow.cc
+++ b/examples/book/treeview/popup/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (ListStore) example");
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
}
diff --git a/examples/book/treeview/tree/examplewindow.cc b/examples/book/treeview/tree/examplewindow.cc
index 46eaeff..00d8bcd 100644
--- a/examples/book/treeview/tree/examplewindow.cc
+++ b/examples/book/treeview/tree/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (TreeStore) example");
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
diff --git a/examples/book/update_ui/examplewindow.cc b/examples/book/update_ui/examplewindow.cc
index 1d5fbc1..62e988f 100644
--- a/examples/book/update_ui/examplewindow.cc
+++ b/examples/book/update_ui/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Start("Start"),
m_Button_Quit("_Quit", true)
{
@@ -34,7 +34,7 @@ ExampleWindow::ExampleWindow()
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Start, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(6);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect(sigc::mem_fun(*this,
&ExampleWindow::on_button_quit) );
m_Button_Start.signal_clicked().connect(sigc::mem_fun(*this,
diff --git a/examples/others/arrow/arrow.cc b/examples/others/arrow/arrow.cc
index f3135a4..2cea439 100644
--- a/examples/others/arrow/arrow.cc
+++ b/examples/others/arrow/arrow.cc
@@ -25,13 +25,13 @@ ArrowButton::ArrowButton(Gtk::ArrowType arrow_type)
Glib::ustring icon_name;
switch (arrow_type)
{
- case Gtk::ARROW_UP: icon_name = "pan-up-symbolic"; break;
- case Gtk::ARROW_DOWN: icon_name = "pan-down-symbolic"; break;
- case Gtk::ARROW_LEFT: icon_name = "pan-start-symbolic"; break;
- case Gtk::ARROW_RIGHT: icon_name = "pan-end-symbolic"; break;
- default: icon_name = "dialog-question"; break;
+ case Gtk::ArrowType::UP: icon_name = "pan-up-symbolic"; break;
+ case Gtk::ArrowType::DOWN: icon_name = "pan-down-symbolic"; break;
+ case Gtk::ArrowType::LEFT: icon_name = "pan-start-symbolic"; break;
+ case Gtk::ArrowType::RIGHT: icon_name = "pan-end-symbolic"; break;
+ default: icon_name = "dialog-question"; break;
}
- set_image_from_icon_name(icon_name, Gtk::ICON_SIZE_BUTTON, true);
+ set_image_from_icon_name(icon_name, Gtk::BuiltinIconSize::BUTTON, true);
}
ArrowButton::~ArrowButton()
@@ -61,16 +61,16 @@ AppWindow::AppWindow()
grid->set_margin(12);
/* Pack and show all our widgets */
- button = Gtk::manage (new ArrowButton (Gtk::ARROW_UP));
+ button = Gtk::manage(new ArrowButton(Gtk::ArrowType::UP));
grid->attach (*button, 1, 0);
- button = Gtk::manage (new ArrowButton (Gtk::ARROW_LEFT));
+ button = Gtk::manage(new ArrowButton(Gtk::ArrowType::LEFT));
grid->attach (*button, 0, 1);
- button = Gtk::manage (new ArrowButton (Gtk::ARROW_RIGHT));
+ button = Gtk::manage(new ArrowButton(Gtk::ArrowType::RIGHT));
grid->attach (*button, 2, 1);
- button = Gtk::manage (new ArrowButton (Gtk::ARROW_DOWN));
+ button = Gtk::manage(new ArrowButton(Gtk::ArrowType::DOWN));
grid->attach (*button, 1, 2);
grid->set_row_spacing(5);
diff --git a/examples/others/calendar/calendar.cc b/examples/others/calendar/calendar.cc
index fa55063..8160a8a 100644
--- a/examples/others/calendar/calendar.cc
+++ b/examples/others/calendar/calendar.cc
@@ -175,7 +175,7 @@ CalendarExample::CalendarExample()
set_resizable(false);
- auto vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, DEF_PAD));
+ auto vbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD));
vbox->set_margin(5);
add(*vbox);
@@ -183,11 +183,11 @@ CalendarExample::CalendarExample()
* The top part of the CalendarExample, flags and fontsel.
*/
- auto hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, DEF_PAD));
+ auto hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, DEF_PAD));
vbox->pack_start(*hbox, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
auto hbbox = Gtk::manage(new Gtk::ButtonBox());
hbox->pack_start(*hbbox, Gtk::PACK_SHRINK, DEF_PAD);
- hbbox->set_layout(Gtk::BUTTONBOX_SPREAD);
+ hbbox->set_layout(Gtk::ButtonBoxStyle::SPREAD);
hbbox->set_spacing(5);
/* Calendar widget */
@@ -201,17 +201,17 @@ CalendarExample::CalendarExample()
calendar_->signal_day_selected().connect(sigc::mem_fun(*this, &CalendarExample::day_selected));
calendar_->signal_day_selected_double_click().connect(sigc::mem_fun(*this,
&CalendarExample::day_selected_double_click));
- auto separator = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
+ auto separator = Gtk::manage(new Gtk::Separator(Gtk::Orientation::VERTICAL));
hbox->pack_start (*separator, Gtk::PACK_SHRINK);
- auto vbox2 = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, DEF_PAD));
+ auto vbox2 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD));
hbox->pack_start(*vbox2, Gtk::PACK_SHRINK, DEF_PAD);
/* Build the Right frame with the flags in */
auto frameFlags = Gtk::manage(new Gtk::Frame("Flags"));
vbox2->pack_start(*frameFlags, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
- auto vbox3 = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, DEF_PAD_SMALL));
+ auto vbox3 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD_SMALL));
frameFlags->add(*vbox3);
struct {
@@ -254,24 +254,24 @@ CalendarExample::CalendarExample()
*/
frame = Gtk::manage(new Gtk::Frame("Signal events"));
vbox->pack_start(*frame, Gtk::PACK_EXPAND_WIDGET, DEF_PAD);
- vbox2 = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, DEF_PAD_SMALL));
+ vbox2 = Gtk::manage(new Gtk::Box(Gtk::Orientation::VERTICAL, DEF_PAD_SMALL));
frame->add(*vbox2);
- hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 5));
+ hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 5));
vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
auto label = Gtk::manage(new Gtk::Label("Day selected:"));
hbox->pack_start (*label, Gtk::PACK_SHRINK);
label_selected_ = new Gtk::Label("");
hbox->pack_start (*label_selected_, Gtk::PACK_SHRINK);
- hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 5));
+ hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 5));
vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
label = Gtk::manage(new Gtk::Label("Day selected double click:"));
hbox->pack_start (*label, Gtk::PACK_SHRINK);
label_selected_double_click_ = new Gtk::Label("");
hbox->pack_start (*label_selected_double_click_, Gtk::PACK_SHRINK);
- hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 5));
+ hbox = Gtk::manage(new Gtk::Box(Gtk::Orientation::HORIZONTAL, 5));
vbox2->pack_start (*hbox, Gtk::PACK_SHRINK);
label = Gtk::manage(new Gtk::Label("Month change:"));
hbox->pack_start (*label, Gtk::PACK_SHRINK);
@@ -280,7 +280,7 @@ CalendarExample::CalendarExample()
auto bbox = Gtk::manage(new Gtk::ButtonBox());
vbox->pack_start(*bbox, Gtk::PACK_SHRINK);
- bbox->set_layout(Gtk::BUTTONBOX_END);
+ bbox->set_layout(Gtk::ButtonBoxStyle::END);
auto button = Gtk::manage(new Gtk::Button("Close"));
button->signal_clicked().connect(
diff --git a/examples/others/cellrenderercustom/cellrendererlist.cc
b/examples/others/cellrenderercustom/cellrendererlist.cc
index 4e8a1a8..f4e2601 100644
--- a/examples/others/cellrenderercustom/cellrendererlist.cc
+++ b/examples/others/cellrenderercustom/cellrendererlist.cc
@@ -50,14 +50,14 @@ CellRendererList::CellRendererList()
sigc::mem_fun(*this, &Self::on_tree_view_button_release_event));
const auto selection = tree_view_.get_selection();
- selection->set_mode(Gtk::SELECTION_BROWSE);
+ selection->set_mode(Gtk::SelectionMode::BROWSE);
selection->signal_changed().connect(sigc::mem_fun(*this, &Self::on_tree_selection_changed));
Gtk::Frame *const frame = new Gtk::Frame();
get_popup_window()->add(*Gtk::manage(frame));
frame->add(tree_view_);
- frame->set_shadow_type(Gtk::SHADOW_OUT);
+ frame->set_shadow_type(Gtk::ShadowType::OUT);
set_focus_widget(tree_view_);
}
diff --git a/examples/others/cellrenderercustom/cellrendererpopup.cc
b/examples/others/cellrenderercustom/cellrendererpopup.cc
index ab25286..f79ab75 100644
--- a/examples/others/cellrenderercustom/cellrendererpopup.cc
+++ b/examples/others/cellrenderercustom/cellrendererpopup.cc
@@ -31,7 +31,7 @@ bool grab_on_window(const Glib::RefPtr<Gdk::Window>& window)
{
auto seat = device->get_seat();
if (seat &&
- seat->grab(window, Gdk::SEAT_CAPABILITY_ALL, true) == Gdk::GRAB_SUCCESS)
+ seat->grab(window, Gdk::SeatCapabilities::ALL, true) == Gdk::GrabStatus::SUCCESS)
return true;
}
@@ -46,7 +46,7 @@ CellRendererPopup::CellRendererPopup()
Glib::ObjectBase (typeid(CellRendererPopup)),
Gtk::CellRendererText (),
button_width_ (-1),
- popup_window_ (Gtk::WINDOW_POPUP),
+ popup_window_ (Gtk::WindowType::POPUP),
focus_widget_ (nullptr),
popup_entry_ (nullptr),
shown_ (false),
diff --git a/examples/others/cellrenderercustom/cellrenderertoggle.cc
b/examples/others/cellrenderercustom/cellrenderertoggle.cc
index 4e9345a..7f44215 100644
--- a/examples/others/cellrenderercustom/cellrenderertoggle.cc
+++ b/examples/others/cellrenderercustom/cellrenderertoggle.cc
@@ -106,7 +106,7 @@ MyCellRendererToggle::MyCellRendererToggle()
property_active_ (*this, "active", false),
property_radio_ (*this, "radio", false)
{
- property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
+ property_mode() = Gtk::CellRendererMode::ACTIVATABLE;
property_xpad() = 2;
property_ypad() = 2;
}
@@ -189,16 +189,16 @@ void MyCellRendererToggle::snapshot_vfunc(Gtk::Snapshot& snapshot,
if(width <= 0 || height <= 0)
return;
- auto state = Gtk::STATE_FLAG_INSENSITIVE;
+ auto state = Gtk::StateFlags::INSENSITIVE;
if (property_activatable_)
state = (Gtk::StateFlags)0;
- if ((flags & Gtk::CELL_RENDERER_SELECTED) != 0)
- state = (widget.has_focus()) ? Gtk::STATE_FLAG_SELECTED : Gtk::STATE_FLAG_ACTIVE;
+ if ((flags & Gtk::CellRendererState::SELECTED) == Gtk::CellRendererState::SELECTED)
+ state = (widget.has_focus()) ? Gtk::StateFlags::SELECTED : Gtk::StateFlags::ACTIVE;
if (property_active_)
- state |= Gtk::STATE_FLAG_CHECKED;
+ state |= Gtk::StateFlags::CHECKED;
auto style_context = widget.get_style_context();
style_context->set_state(state);
diff --git a/examples/others/cellrenderercustom/popupentry.cc
b/examples/others/cellrenderercustom/popupentry.cc
index 5997cd9..b800a33 100644
--- a/examples/others/cellrenderercustom/popupentry.cc
+++ b/examples/others/cellrenderercustom/popupentry.cc
@@ -34,7 +34,7 @@ PopupEntry::PopupEntry(const Glib::ustring& path)
entry_ (nullptr),
editing_canceled_ (false)
{
- Gtk::Box *const hbox = new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL);
+ Gtk::Box *const hbox = new Gtk::Box(Gtk::Orientation::HORIZONTAL);
add(*Gtk::manage(hbox));
entry_ = new Gtk::Entry();
@@ -43,10 +43,10 @@ PopupEntry::PopupEntry(const Glib::ustring& path)
button_ = new Gtk::Button();
hbox->pack_start(*Gtk::manage(button_), Gtk::PACK_SHRINK);
- button_->set_image_from_icon_name("pan-down-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+ button_->set_image_from_icon_name("pan-down-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
set_can_focus();
- add_events(Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
+ add_events(Gdk::EventMask::KEY_PRESS_MASK | Gdk::EventMask::KEY_RELEASE_MASK);
}
PopupEntry::~PopupEntry()
@@ -80,12 +80,12 @@ bool PopupEntry::get_editing_canceled() const
// static
int PopupEntry::get_button_width()
{
- Gtk::Window window (Gtk::WINDOW_POPUP);
+ Gtk::Window window (Gtk::WindowType::POPUP);
Gtk::Button *const button = new Gtk::Button();
window.add(*Gtk::manage(button));
- button->set_image_from_icon_name("pan-down-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+ button->set_image_from_icon_name("pan-down-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
// Urgh. Hackish :/
window.move(-500, -500);
diff --git a/examples/others/dnd/dndwindow.cc b/examples/others/dnd/dndwindow.cc
index f5ca75d..d90eab3 100644
--- a/examples/others/dnd/dndwindow.cc
+++ b/examples/others/dnd/dndwindow.cc
@@ -23,7 +23,7 @@ DnDWindow::DnDWindow()
: m_Label_Drop("Drop here\n"), m_Label_Popup("Popup\n"),
m_Button("Drag Here\n"),
m_have_drag(false),
- m_PopupWindow(Gtk::WINDOW_POPUP)
+ m_PopupWindow(Gtk::WindowType::POPUP)
{
m_popped_up = false;
m_in_popup = false;
@@ -42,7 +42,7 @@ DnDWindow::DnDWindow()
//Targets without rootwin:
m_listTargetsNoRoot.assign(m_listTargets.begin(), --m_listTargets.end());
- m_Label_Drop.drag_dest_set(m_listTargetsNoRoot, Gtk::DEST_DEFAULT_ALL, Gdk::DragAction(GDK_ACTION_COPY |
GDK_ACTION_MOVE));
+ m_Label_Drop.drag_dest_set(m_listTargetsNoRoot, Gtk::DestDefaults::ALL, Gdk::DragAction::COPY |
Gdk::DragAction::MOVE);
m_Label_Drop.signal_drag_data_received().connect( sigc::mem_fun(*this,
&DnDWindow::on_label_drop_drag_data_received) );
@@ -50,7 +50,7 @@ DnDWindow::DnDWindow()
m_Label_Drop.set_hexpand(true);
m_Label_Drop.set_vexpand(true);
- m_Label_Popup.drag_dest_set(m_listTargetsNoRoot, Gtk::DEST_DEFAULT_ALL, Gdk::DragAction(GDK_ACTION_COPY |
GDK_ACTION_MOVE));
+ m_Label_Popup.drag_dest_set(m_listTargetsNoRoot, Gtk::DestDefaults::ALL, Gdk::DragAction::COPY |
Gdk::DragAction::MOVE);
m_Grid.attach(m_Label_Popup, 1, 1);
m_Label_Popup.set_hexpand(true);
@@ -73,8 +73,8 @@ DnDWindow::DnDWindow()
/* Drag site */
- m_Button.drag_source_set(m_listTargets, Gdk::ModifierType(GDK_BUTTON1_MASK | GDK_BUTTON3_MASK),
- Gdk::DragAction(GDK_ACTION_COPY | GDK_ACTION_MOVE));
+ m_Button.drag_source_set(m_listTargets, Gdk::ModifierType::BUTTON1_MASK | Gdk::ModifierType::BUTTON3_MASK,
+ Gdk::DragAction::COPY | Gdk::DragAction::MOVE);
m_Button.drag_source_set_icon(m_drag_icon);
@@ -228,7 +228,7 @@ bool DnDWindow::on_popup_timeout()
void DnDWindow::create_popup()
{
- m_PopupWindow.set_position(Gtk::WIN_POS_MOUSE);
+ m_PopupWindow.set_position(Gtk::WindowPosition::MOUSE);
//Create Grid and fill it:
auto pGrid = Gtk::manage(new Gtk::Grid());
@@ -242,8 +242,9 @@ void DnDWindow::create_popup()
auto pButton = Gtk::manage(new Gtk::Button(buffer));
pGrid->attach(*pButton, i, j, 1, 1);
- pButton->drag_dest_set(m_listTargetsNoRoot, Gtk::DEST_DEFAULT_ALL, Gdk::DragAction(GDK_ACTION_COPY |
GDK_ACTION_MOVE));
- pButton->signal_drag_motion().connect( sigc::mem_fun(*this, &DnDWindow::on_popup_button_drag_motion)
); pButton->signal_drag_leave().connect( sigc::mem_fun(*this,
&DnDWindow::on_popup_button_drag_leave) );
+ pButton->drag_dest_set(m_listTargetsNoRoot, Gtk::DestDefaults::ALL, Gdk::DragAction::COPY |
Gdk::DragAction::MOVE);
+ pButton->signal_drag_motion().connect( sigc::mem_fun(*this, &DnDWindow::on_popup_button_drag_motion) );
+ pButton->signal_drag_leave().connect( sigc::mem_fun(*this, &DnDWindow::on_popup_button_drag_leave) );
}
}
diff --git a/examples/others/exception/exceptiontest.cc b/examples/others/exception/exceptiontest.cc
index d828f48..0f99c78 100644
--- a/examples/others/exception/exceptiontest.cc
+++ b/examples/others/exception/exceptiontest.cc
@@ -8,8 +8,6 @@
#include <gtkmm/button.h>
-
-
namespace
{
@@ -98,7 +96,7 @@ int main(int argc, char** argv)
Gtk::Window window;
window.set_title("Exception Handlers");
- Gtk::Box *const box = new Gtk::Box(Gtk::ORIENTATION_VERTICAL, 5);
+ Gtk::Box *const box = new Gtk::Box(Gtk::Orientation::VERTICAL, 5);
box->set_margin(10);
window.add(*Gtk::manage(box));
diff --git a/examples/others/idle/idle.cc b/examples/others/idle/idle.cc
index aef0f98..49e0b09 100644
--- a/examples/others/idle/idle.cc
+++ b/examples/others/idle/idle.cc
@@ -40,7 +40,7 @@ IdleExample::IdleExample() :
m_quit.signal_clicked().connect(sigc::mem_fun(*this, &Gtk::Widget::hide));
// put buttons into container
- Gtk::Box *vbox = manage( new Gtk::Box(Gtk::ORIENTATION_VERTICAL,5));
+ Gtk::Box *vbox = manage( new Gtk::Box(Gtk::Orientation::VERTICAL,5));
// adding a few widgets
vbox->pack_start(* manage(new Gtk::Label("Formatting windows drive C:")));
@@ -53,7 +53,7 @@ IdleExample::IdleExample() :
vbox->pack_start(* manage(new Gtk::Label("5000 MB")));
vbox->pack_start(m_progressbar_d);
- Gtk::Box *hbox = manage( new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL,10));
+ Gtk::Box *hbox = manage( new Gtk::Box(Gtk::Orientation::HORIZONTAL,10));
hbox->pack_start(m_quit, Gtk::PACK_EXPAND_PADDING);
vbox->pack_start(*hbox);
diff --git a/examples/others/statusbar/statusbar.cc b/examples/others/statusbar/statusbar.cc
index 16c8000..2ea01ce 100644
--- a/examples/others/statusbar/statusbar.cc
+++ b/examples/others/statusbar/statusbar.cc
@@ -26,7 +26,7 @@ protected:
StatusBarExample::StatusBarExample()
:
m_count(1),
- m_vbox(Gtk::ORIENTATION_VERTICAL, 1),
+ m_vbox(Gtk::Orientation::VERTICAL, 1),
m_bPush("push item"),
m_bPop("pop last item")
{
diff --git a/examples/others/tictactoe/tictactoe.cc b/examples/others/tictactoe/tictactoe.cc
index 5dd55dc..a5ef440 100644
--- a/examples/others/tictactoe/tictactoe.cc
+++ b/examples/others/tictactoe/tictactoe.cc
@@ -22,7 +22,7 @@
#include "tictactoe.h"
TicTacToe::TicTacToe()
-: Gtk::Box(Gtk::ORIENTATION_VERTICAL)
+: Gtk::Box(Gtk::Orientation::VERTICAL)
{
auto grid = Gtk::manage( new Gtk::Grid() );
grid->set_row_homogeneous(true);
diff --git a/examples/others/treemodelcustom/examplewindow.cc
b/examples/others/treemodelcustom/examplewindow.cc
index bcd7c3f..4cead84 100644
--- a/examples/others/treemodelcustom/examplewindow.cc
+++ b/examples/others/treemodelcustom/examplewindow.cc
@@ -18,7 +18,7 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_Button_Quit("Quit")
{
set_title("Gtk::TreeView (custom TreeModel) example");
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
m_ScrolledWindow.add(m_TreeView);
//Only show the scrollbars when they are necessary:
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
m_VBox.pack_start(m_ButtonBox, Gtk::PACK_SHRINK);
m_ButtonBox.pack_start(m_Button_Quit, Gtk::PACK_SHRINK);
m_ButtonBox.set_margin(5);
- m_ButtonBox.set_layout(Gtk::BUTTONBOX_END);
+ m_ButtonBox.set_layout(Gtk::ButtonBoxStyle::END);
m_Button_Quit.signal_clicked().connect( sigc::mem_fun(*this, &ExampleWindow::on_button_quit) );
//Create the Tree model:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
