[gtkmm] Fix make check when _WRAP_ENUM generates enum class
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Fix make check when _WRAP_ENUM generates enum class
- Date: Tue, 11 Apr 2017 17:58:16 +0000 (UTC)
commit f60bdc3a20e36e4f2250ef529d45fd5bcfb96008
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Tue Apr 11 19:55:49 2017 +0200
Fix make check when _WRAP_ENUM generates enum class
Bug 86864
demos/gtk-demo/demowindow.cc | 8 +-
demos/gtk-demo/example_appwindow.cc | 6 +-
demos/gtk-demo/example_builder.cc | 18 ++--
demos/gtk-demo/example_buttonbox.cc | 26 +++---
demos/gtk-demo/example_change_display.cc | 40 +++++-----
demos/gtk-demo/example_colorsel.cc | 10 +-
demos/gtk-demo/example_dialog.cc | 20 +++--
demos/gtk-demo/example_drawingarea.cc | 16 ++--
demos/gtk-demo/example_flowbox.cc | 4 +-
demos/gtk-demo/example_gestures.cc | 12 ++--
demos/gtk-demo/example_glarea.cc | 8 +-
demos/gtk-demo/example_headerbar.cc | 8 +-
demos/gtk-demo/example_iconbrowser.cc | 40 +++++-----
demos/gtk-demo/example_iconview.cc | 12 ++--
demos/gtk-demo/example_images.cc | 24 +++---
demos/gtk-demo/example_menus.cc | 14 ++--
demos/gtk-demo/example_overlay.cc | 90 ++++++++++----------
demos/gtk-demo/example_panes.cc | 12 ++--
demos/gtk-demo/example_pixbufs.cc | 6 +-
demos/gtk-demo/example_sizegroup.cc | 16 ++--
demos/gtk-demo/example_stack.cc | 6 +-
demos/gtk-demo/example_stacksidebar.cc | 8 +-
demos/gtk-demo/example_textview.cc | 36 ++++----
demos/gtk-demo/example_treeview_editable_cells.cc | 10 +-
demos/gtk-demo/example_treeview_liststore.cc | 8 +-
demos/gtk-demo/example_treeview_treestore.cc | 18 ++--
demos/gtk-demo/textwidget.cc | 14 ++--
tests/child_widget2/main.cc | 2 +-
tests/delete_cpp_child/main.cc | 2 +-
tests/dialog/main.cc | 2 +-
tests/dialog_deletethis/main.cc | 5 +-
tests/refcount_dialog/main.cc | 2 +-
32 files changed, 253 insertions(+), 250 deletions(-)
---
diff --git a/demos/gtk-demo/demowindow.cc b/demos/gtk-demo/demowindow.cc
index 0d2f810..221e01c 100644
--- a/demos/gtk-demo/demowindow.cc
+++ b/demos/gtk-demo/demowindow.cc
@@ -58,7 +58,7 @@ const DemoColumns& demo_columns()
DemoWindow::DemoWindow()
: m_RunButton("Run"),
- m_HBox(Gtk::ORIENTATION_HORIZONTAL),
+ m_HBox(Gtk::Orientation::HORIZONTAL),
m_TextWidget_Info(false),
m_TextWidget_Source(true)
{
@@ -73,7 +73,7 @@ DemoWindow::DemoWindow()
m_TreeView.set_model(m_refTreeStore);
m_refTreeSelection = m_TreeView.get_selection();
- m_refTreeSelection->set_mode(Gtk::SELECTION_BROWSE);
+ m_refTreeSelection->set_mode(Gtk::SelectionMode::BROWSE);
m_refTreeSelection->set_select_function( sigc::ptr_fun(&DemoWindow::select_function) );
m_TreeView.set_size_request(200, -1);
@@ -81,7 +81,7 @@ DemoWindow::DemoWindow()
fill_tree();
//SideBar
- m_SideBar.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ m_SideBar.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
m_SideBar.get_style_context()->add_class("sidebar");
m_SideBar.add(m_TreeView);
m_HBox.pack_start(m_SideBar, Gtk::PACK_SHRINK);
@@ -139,7 +139,7 @@ void DemoWindow::fill_tree()
}
auto pCell = Gtk::manage(new Gtk::CellRendererText());
- pCell->property_style() = Pango::STYLE_ITALIC;
+ pCell->property_style() = Pango::Style::ITALIC;
auto pColumn = new Gtk::TreeViewColumn("Widget (double click for demo)", *pCell);
pColumn->add_attribute(pCell->property_text(), columns.title);
diff --git a/demos/gtk-demo/example_appwindow.cc b/demos/gtk-demo/example_appwindow.cc
index 7af7032..0899d21 100644
--- a/demos/gtk-demo/example_appwindow.cc
+++ b/demos/gtk-demo/example_appwindow.cc
@@ -104,8 +104,8 @@ Example_AppWindow::Example_AppWindow()
}
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_IN);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
+ m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::IN);
// left top width height
m_Grid.attach(m_ScrolledWindow, 0, 2, 1, 1);
@@ -133,7 +133,7 @@ Example_AppWindow::~Example_AppWindow()
void Example_AppWindow::on_menu_item()
{
Gtk::MessageDialog dialog(*this, "You selected or toggled the menu item", false,
- Gtk::MESSAGE_INFO, Gtk::BUTTONS_CLOSE);
+ Gtk::MessageType::INFO, Gtk::ButtonsType::CLOSE);
dialog.run();
}
diff --git a/demos/gtk-demo/example_builder.cc b/demos/gtk-demo/example_builder.cc
index 72afb65..adf166b 100644
--- a/demos/gtk-demo/example_builder.cc
+++ b/demos/gtk-demo/example_builder.cc
@@ -71,47 +71,47 @@ Example_Builder::Example_Builder(
builder->get_widget("new_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_n, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_n, Gdk::ModifierType::CONTROL_MASK, Gtk::AccelFlags::VISIBLE);
builder->get_widget("open_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_o, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_o, Gdk::ModifierType::CONTROL_MASK, Gtk::AccelFlags::VISIBLE);
builder->get_widget("save_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_s, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_s, Gdk::ModifierType::CONTROL_MASK, Gtk::AccelFlags::VISIBLE);
builder->get_widget("quit_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_q, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_q, Gdk::ModifierType::CONTROL_MASK, Gtk::AccelFlags::VISIBLE);
builder->get_widget("copy_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_c, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_c, Gdk::ModifierType::CONTROL_MASK, Gtk::AccelFlags::VISIBLE);
builder->get_widget("cut_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_x, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_x, Gdk::ModifierType::CONTROL_MASK, Gtk::AccelFlags::VISIBLE);
builder->get_widget("paste_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_v, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_v, Gdk::ModifierType::CONTROL_MASK, Gtk::AccelFlags::VISIBLE);
builder->get_widget("help_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_F1, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_F1, (Gdk::ModifierType)0, Gtk::AccelFlags::VISIBLE);
builder->get_widget("about_item", pMenuItem);
if (pMenuItem)
pMenuItem->add_accelerator("activate", refAccelGroup,
- GDK_KEY_F7, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
+ GDK_KEY_F7, (Gdk::ModifierType)0, Gtk::AccelFlags::VISIBLE);
}
Example_Builder::~Example_Builder()
diff --git a/demos/gtk-demo/example_buttonbox.cc b/demos/gtk-demo/example_buttonbox.cc
index 7471d41..38531fd 100644
--- a/demos/gtk-demo/example_buttonbox.cc
+++ b/demos/gtk-demo/example_buttonbox.cc
@@ -31,9 +31,9 @@ Gtk::Window* do_buttonbox()
Example_ButtonBox::Example_ButtonBox()
: m_Frame_Horizontal("Horizontal Button Boxes"),
m_Frame_Vertical("Vertical Button Boxes"),
- m_VBox_Main(Gtk::ORIENTATION_VERTICAL),
- m_VBox(Gtk::ORIENTATION_VERTICAL),
- m_HBox(Gtk::ORIENTATION_HORIZONTAL)
+ m_VBox_Main(Gtk::Orientation::VERTICAL),
+ m_VBox(Gtk::Orientation::VERTICAL),
+ m_HBox(Gtk::Orientation::HORIZONTAL)
{
set_title("Button Boxes");
@@ -47,20 +47,20 @@ Example_ButtonBox::Example_ButtonBox()
m_VBox.property_margin() = 10;
m_Frame_Horizontal.add(m_VBox);
- m_VBox.pack_start( *(create_button_box(true, "Spread", 40, Gtk::BUTTONBOX_SPREAD)) );
- m_VBox.pack_start( *(create_button_box(true, "Edge", 40, Gtk::BUTTONBOX_EDGE)) );
- m_VBox.pack_start( *(create_button_box(true, "Start", 40, Gtk::BUTTONBOX_START)) );
- m_VBox.pack_start( *(create_button_box(true, "End", 40, Gtk::BUTTONBOX_END)) );
+ m_VBox.pack_start( *(create_button_box(true, "Spread", 40, Gtk::ButtonBoxStyle::SPREAD)) );
+ m_VBox.pack_start( *(create_button_box(true, "Edge", 40, Gtk::ButtonBoxStyle::EDGE)) );
+ m_VBox.pack_start( *(create_button_box(true, "Start", 40, Gtk::ButtonBoxStyle::START)) );
+ m_VBox.pack_start( *(create_button_box(true, "End", 40, Gtk::ButtonBoxStyle::END)) );
m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::PACK_EXPAND_WIDGET, 10);
m_HBox.property_margin() = 10;
m_Frame_Vertical.add(m_HBox);
- m_HBox.pack_start( *(create_button_box(false, "Spread", 30, Gtk::BUTTONBOX_SPREAD)) );
- m_HBox.pack_start( *(create_button_box(false, "Edge", 30, Gtk::BUTTONBOX_EDGE)) );
- m_HBox.pack_start( *(create_button_box(false, "Start", 30, Gtk::BUTTONBOX_START)) );
- m_HBox.pack_start( *(create_button_box(false, "End", 30, Gtk::BUTTONBOX_END)) );
+ m_HBox.pack_start( *(create_button_box(false, "Spread", 30, Gtk::ButtonBoxStyle::SPREAD)) );
+ m_HBox.pack_start( *(create_button_box(false, "Edge", 30, Gtk::ButtonBoxStyle::EDGE)) );
+ m_HBox.pack_start( *(create_button_box(false, "Start", 30, Gtk::ButtonBoxStyle::START)) );
+ m_HBox.pack_start( *(create_button_box(false, "End", 30, Gtk::ButtonBoxStyle::END)) );
}
Example_ButtonBox::~Example_ButtonBox()
@@ -73,10 +73,10 @@ Gtk::Frame* Example_ButtonBox::create_button_box(bool horizontal, const Glib::us
Gtk::ButtonBox* pButtonBox = nullptr;
if (horizontal)
- pButtonBox = Gtk::manage(new Gtk::ButtonBox(Gtk::ORIENTATION_HORIZONTAL));
+ pButtonBox = Gtk::manage(new Gtk::ButtonBox(Gtk::Orientation::HORIZONTAL));
else
{
- pButtonBox = Gtk::manage(new Gtk::ButtonBox(Gtk::ORIENTATION_VERTICAL));
+ pButtonBox = Gtk::manage(new Gtk::ButtonBox(Gtk::Orientation::VERTICAL));
pFrame->set_margin_start(5);
pFrame->set_margin_end(5);
}
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 2ab7a99..adc5fd5 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -100,15 +100,15 @@ protected:
Example_ChangeDisplay::Example_ChangeDisplay()
: Gtk::Dialog("Change Display"),
- m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
+ m_VBox(Gtk::Orientation::VERTICAL, 5),
m_Frame_Display("Display"),
- m_ButtonBox_Display(Gtk::ORIENTATION_VERTICAL, 5),
+ m_ButtonBox_Display(Gtk::Orientation::VERTICAL, 5),
m_Button_Display_Open("_Open...", true), m_Button_Display_Close("_Close...", true),
m_pPopup(nullptr),
m_popup_clicked(false)
{
- add_button("_Close", Gtk::RESPONSE_CLOSE);
- add_button("Change", Gtk::RESPONSE_OK);
+ add_button("_Close", Gtk::ResponseType::CLOSE);
+ add_button("Change", Gtk::ResponseType::OK);
set_default_size(300, 400);
@@ -135,7 +135,7 @@ Example_ChangeDisplay::Example_ChangeDisplay()
m_VBox.pack_start(m_Frame_Display);
- m_refSizeGroup_Display = Gtk::SizeGroup::create(Gtk::SIZE_GROUP_HORIZONTAL);
+ m_refSizeGroup_Display = Gtk::SizeGroup::create(Gtk::SizeGroupMode::HORIZONTAL);
m_refSizeGroup_Display->add_widget(m_ButtonBox_Display);
}
@@ -153,20 +153,20 @@ Example_ChangeDisplay::~Example_ChangeDisplay()
void Example_ChangeDisplay::setup_frame(Gtk::Frame& frame, Gtk::TreeView& treeview, Gtk::Box& buttonbox)
{
- auto pHBox = Gtk::manage( new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 8) );
+ auto pHBox = Gtk::manage( new Gtk::Box(Gtk::Orientation::HORIZONTAL, 8) );
pHBox->property_margin() = 8;
frame.add(*pHBox);
auto pScrolledWindow = Gtk::manage( new Gtk::ScrolledWindow() );
- pScrolledWindow->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- pScrolledWindow->set_shadow_type(Gtk::SHADOW_IN);
+ pScrolledWindow->set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
+ pScrolledWindow->set_shadow_type(Gtk::ShadowType::IN);
pHBox->pack_start(*pScrolledWindow);
treeview.set_headers_visible(false);
pScrolledWindow->add(treeview);
auto refSelection = treeview.get_selection();
- refSelection->set_mode(Gtk::SELECTION_BROWSE);
+ refSelection->set_mode(Gtk::SelectionMode::BROWSE);
pHBox->pack_start(buttonbox, Gtk::PACK_SHRINK);
}
@@ -206,10 +206,10 @@ void Example_ChangeDisplay::on_display_closed(bool /* is_error */, Glib::RefPtr<
void Example_ChangeDisplay::on_button_display_open()
{
Gtk::Dialog dialog("Open Display", true);
- dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL);
- dialog.add_button("_OK", Gtk::RESPONSE_OK);
+ dialog.add_button("_Cancel", Gtk::ResponseType::CANCEL);
+ dialog.add_button("_OK", Gtk::ResponseType::OK);
- dialog.set_default_response(Gtk::RESPONSE_OK);
+ dialog.set_default_response(Gtk::ResponseType::OK);
Gtk::Entry entry;
entry.set_activates_default();
@@ -225,7 +225,7 @@ void Example_ChangeDisplay::on_button_display_open()
while (!refResult)
{
gint response_id = dialog.run();
- if (response_id != Gtk::RESPONSE_OK)
+ if (response_id != Gtk::ResponseType::OK)
break;
auto new_screen_name = entry.get_text();
@@ -277,7 +277,7 @@ void Example_ChangeDisplay::query_change_display()
void Example_ChangeDisplay::on_response(int response_id)
{
- if (response_id == Gtk::RESPONSE_OK)
+ if (response_id == Gtk::ResponseType::OK)
query_change_display();
else
hide();
@@ -303,15 +303,15 @@ Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::S
m_pPopup->show();
- auto cursor = Gdk::Cursor::create(refDisplay, Gdk::CROSSHAIR);
+ auto cursor = Gdk::Cursor::create(refDisplay, Gdk::CursorType::CROSSHAIR);
Gtk::Window* toplevel = nullptr;
//TODO: Find a suitable replacement for this:
//const GdkGrabStatus grabbed = m_pPopup->get_window()->grab(false, Gdk::BUTTON_RELEASE_MASK, cursor,
GDK_CURRENT_TIME);
//Check it when the GTK+ example has been updated and file a bug about the unhelpful deprecation comment.
- const auto grabbed = Gdk::GRAB_SUCCESS;
- if(grabbed == Gdk::GRAB_SUCCESS )
+ const auto grabbed = Gdk::GrabStatus::SUCCESS;
+ if(grabbed == Gdk::GrabStatus::SUCCESS )
{
m_popup_clicked = false;
m_pPopup->signal_button_release_event().connect( sigc::mem_fun(*this,
&Example_ChangeDisplay::on_popup_button_release_event) );
@@ -367,14 +367,14 @@ bool Example_ChangeDisplay::on_popup_button_release_event(GdkEventButton* /* eve
}
Popup::Popup(const Glib::RefPtr<Gdk::Screen>& screen, const Glib::ustring& prompt)
-: Gtk::Window(Gtk::WINDOW_POPUP),
+: Gtk::Window(Gtk::WindowType::POPUP),
m_Label(prompt)
{
set_screen(screen);
set_modal(true);
- set_position(Gtk::WIN_POS_CENTER);
+ set_position(Gtk::WindowPosition::CENTER);
- m_Frame.set_shadow_type(Gtk::SHADOW_OUT);
+ m_Frame.set_shadow_type(Gtk::ShadowType::OUT);
add(m_Frame);
m_Label.property_margin() = 10;
diff --git a/demos/gtk-demo/example_colorsel.cc b/demos/gtk-demo/example_colorsel.cc
index 877e726..ab8a7c4 100644
--- a/demos/gtk-demo/example_colorsel.cc
+++ b/demos/gtk-demo/example_colorsel.cc
@@ -34,7 +34,7 @@ Gtk::Window* do_colorsel()
}
Example_ColorSel::Example_ColorSel()
-: m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
+: m_VBox(Gtk::Orientation::VERTICAL, 8),
m_Button("_Change the above color", true)
{
set_title("Color Chooser");
@@ -43,7 +43,7 @@ Example_ColorSel::Example_ColorSel()
add(m_VBox);
// Create the color swatch area
- m_Frame.set_shadow_type(Gtk::SHADOW_IN);
+ m_Frame.set_shadow_type(Gtk::ShadowType::IN);
m_VBox.pack_start(m_Frame);
// set a fixed size
@@ -56,8 +56,8 @@ Example_ColorSel::Example_ColorSel()
m_Frame.add(m_DrawingArea);
- m_Button.set_halign(Gtk::ALIGN_END);
- m_Button.set_valign(Gtk::ALIGN_CENTER);
+ m_Button.set_halign(Gtk::Align::END);
+ m_Button.set_valign(Gtk::Align::CENTER);
m_VBox.pack_start(m_Button, Gtk::PACK_SHRINK);
@@ -76,7 +76,7 @@ void Example_ColorSel::on_button_clicked()
const int response = dialog.run();
- if(response == Gtk::RESPONSE_OK)
+ if(response == Gtk::ResponseType::OK)
{
m_Color = dialog.get_rgba();
}
diff --git a/demos/gtk-demo/example_dialog.cc b/demos/gtk-demo/example_dialog.cc
index 48bc7be..04847b8 100644
--- a/demos/gtk-demo/example_dialog.cc
+++ b/demos/gtk-demo/example_dialog.cc
@@ -58,9 +58,11 @@ Gtk::Window* do_dialog()
Example_Dialog::Example_Dialog()
: m_Frame("Dialogs"),
- m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
- m_HBox(Gtk::ORIENTATION_HORIZONTAL, 8), m_HBox2(Gtk::ORIENTATION_HORIZONTAL, 8),
- m_Button_Message("_Message Dialog", true), m_Button_Interactive("_Interactive Dialog", true),
+ m_VBox(Gtk::Orientation::VERTICAL, 8),
+ m_HBox(Gtk::Orientation::HORIZONTAL, 8),
+ m_HBox2(Gtk::Orientation::HORIZONTAL, 8),
+ m_Button_Message("_Message Dialog", true),
+ m_Button_Interactive("_Interactive Dialog", true),
m_Label1("_Entry 1", true),
m_Label2("E_ntry 2", true)
{
@@ -79,7 +81,7 @@ Example_Dialog::Example_Dialog()
m_VBox.pack_start(m_HBox, Gtk::PACK_SHRINK);
m_Button_Message.signal_clicked().connect(sigc::mem_fun(*this, &Example_Dialog::on_button_message));
m_HBox.pack_start(m_Button_Message, Gtk::PACK_SHRINK);
- m_VBox.pack_start(*(Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL))), Gtk::PACK_SHRINK);
+ m_VBox.pack_start(*(Gtk::manage(new Gtk::Separator(Gtk::Orientation::HORIZONTAL))), Gtk::PACK_SHRINK);
/* Interactive dialog*/
@@ -114,7 +116,7 @@ void Example_Dialog::on_button_message()
auto buf = Glib::make_unique_ptr_gfree(g_strdup_printf("%d", m_count));
strMessage += buf.get();
}
- Gtk::MessageDialog dialog(*this, strMessage, false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK, true); //true =
modal
+ Gtk::MessageDialog dialog(*this, strMessage, false, Gtk::MessageType::INFO, Gtk::ButtonsType::OK, true);
//true = modal
/*int response =*/ dialog.run();
m_count++;
@@ -132,13 +134,13 @@ void Example_Dialog::on_button_interactive()
Dialog_Interactive::Dialog_Interactive(Gtk::Window& parent, const Glib::ustring& entry1, const
Glib::ustring& entry2)
: Gtk::Dialog("Interactive Dialog", parent, true),
- m_HBox(Gtk::ORIENTATION_HORIZONTAL, 8),
+ m_HBox(Gtk::Orientation::HORIZONTAL, 8),
m_Label1("_Entry 1", true), m_Label2("E_ntry 2", true),
m_Image()
{
- m_Image.set_from_icon_name("dialog-question", Gtk::ICON_SIZE_DIALOG);
- add_button("_OK", Gtk::RESPONSE_OK);
- add_button("_Cancel", Gtk::RESPONSE_CANCEL);
+ m_Image.set_from_icon_name("dialog-question", Gtk::BuiltinIconSize::DIALOG);
+ add_button("_OK", Gtk::ResponseType::OK);
+ add_button("_Cancel", Gtk::ResponseType::CANCEL);
get_content_area()->pack_start(m_HBox, Gtk::PACK_SHRINK);
m_HBox.pack_start(m_Image, Gtk::PACK_SHRINK);
diff --git a/demos/gtk-demo/example_drawingarea.cc b/demos/gtk-demo/example_drawingarea.cc
index ba06d2e..ee0d9b6 100644
--- a/demos/gtk-demo/example_drawingarea.cc
+++ b/demos/gtk-demo/example_drawingarea.cc
@@ -50,7 +50,7 @@ Gtk::Window* do_drawingarea()
Example_DrawingArea::Example_DrawingArea()
:
- m_VBox(Gtk::ORIENTATION_VERTICAL, 8)
+ m_VBox(Gtk::Orientation::VERTICAL, 8)
{
set_title("Drawing Area");
@@ -63,7 +63,7 @@ Example_DrawingArea::Example_DrawingArea()
m_Label_Checkerboard.set_markup("<u>Checkerboard pattern</u>");
m_VBox.pack_start(m_Label_Checkerboard, Gtk::PACK_SHRINK);
- m_Frame_Checkerboard.set_shadow_type(Gtk::SHADOW_IN);
+ m_Frame_Checkerboard.set_shadow_type(Gtk::ShadowType::IN);
m_VBox.pack_start(m_Frame_Checkerboard);
/* set a minimum size */
@@ -80,7 +80,7 @@ Example_DrawingArea::Example_DrawingArea()
m_Label_Scribble.set_markup("<u>Scribble area</u>");
m_VBox.pack_start(m_Label_Scribble, Gtk::PACK_SHRINK);
- m_Frame_Scribble.set_shadow_type(Gtk::SHADOW_IN);
+ m_Frame_Scribble.set_shadow_type(Gtk::ShadowType::IN);
m_VBox.pack_start(m_Frame_Scribble);
/* set a minimum size */
@@ -104,10 +104,10 @@ Example_DrawingArea::Example_DrawingArea()
/* Ask to receive events the drawing area doesn't normally
* subscribe to.
*/
- m_DrawingArea_Scribble.add_events(Gdk::LEAVE_NOTIFY_MASK |
- Gdk::BUTTON_PRESS_MASK |
- Gdk::POINTER_MOTION_MASK |
- Gdk::STRUCTURE_MASK);
+ m_DrawingArea_Scribble.add_events(Gdk::EventMask::LEAVE_NOTIFY_MASK |
+ Gdk::EventMask::BUTTON_PRESS_MASK |
+ Gdk::EventMask::POINTER_MOTION_MASK |
+ Gdk::EventMask::STRUCTURE_MASK);
}
Example_DrawingArea::~Example_DrawingArea()
@@ -206,7 +206,7 @@ bool Example_DrawingArea::on_drawingarea_scribble_motion_notify_event(GdkEventMo
Glib::wrap(motion_event->device, true); // true == take_copy
refWindow->get_device_position(device, x, y, state);
- if((state & Gdk::BUTTON1_MASK) != 0)
+ if((state & Gdk::ModifierType::BUTTON1_MASK) != Gdk::ModifierType::BUTTON1_MASK)
scribble_draw_brush(x, y);
}
}
diff --git a/demos/gtk-demo/example_flowbox.cc b/demos/gtk-demo/example_flowbox.cc
index 88d85a4..5ce5dd5 100644
--- a/demos/gtk-demo/example_flowbox.cc
+++ b/demos/gtk-demo/example_flowbox.cc
@@ -44,11 +44,11 @@ Example_FlowBox::Example_FlowBox()
// Scrolled window
m_scrolled_window.property_margin() = 6;
- 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/demos/gtk-demo/example_gestures.cc b/demos/gtk-demo/example_gestures.cc
index 5bb4e78..f04e9f5 100644
--- a/demos/gtk-demo/example_gestures.cc
+++ b/demos/gtk-demo/example_gestures.cc
@@ -52,28 +52,28 @@ Example_Gestures::Example_Gestures()
set_default_size(400, 400);
add(m_DrawingArea);
- m_DrawingArea.add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK |
- Gdk::POINTER_MOTION_MASK | Gdk::TOUCH_MASK);
+ m_DrawingArea.add_events(Gdk::EventMask::BUTTON_PRESS_MASK | Gdk::EventMask::BUTTON_RELEASE_MASK |
+ Gdk::EventMask::POINTER_MOTION_MASK | Gdk::EventMask::TOUCH_MASK);
m_DrawingArea.set_draw_func(sigc::mem_fun(*this, &Example_Gestures::on_drawing_area_draw));
// Create gestures.
m_GestureSwipe = Gtk::GestureSwipe::create(m_DrawingArea);
- m_GestureSwipe->set_propagation_phase(Gtk::PHASE_BUBBLE);
+ m_GestureSwipe->set_propagation_phase(Gtk::PropagationPhase::BUBBLE);
m_GestureSwipe->signal_swipe().connect(sigc::mem_fun(*this, &Example_Gestures::on_gesture_swipe_swipe));
m_GestureSwipe->set_touch_only(false);
m_GestureLongPress = Gtk::GestureLongPress::create(m_DrawingArea);
- m_GestureLongPress->set_propagation_phase(Gtk::PHASE_BUBBLE);
+ m_GestureLongPress->set_propagation_phase(Gtk::PropagationPhase::BUBBLE);
m_GestureLongPress->signal_pressed().connect(sigc::mem_fun(*this,
&Example_Gestures::on_gesture_long_press_pressed));
m_GestureLongPress->signal_end().connect(sigc::mem_fun(*this,
&Example_Gestures::on_gesture_long_press_end));
m_GestureLongPress->set_touch_only(false);
m_GestureRotate = Gtk::GestureRotate::create(m_DrawingArea);
- m_GestureRotate->set_propagation_phase(Gtk::PHASE_BUBBLE);
+ m_GestureRotate->set_propagation_phase(Gtk::PropagationPhase::BUBBLE);
m_GestureRotate->signal_angle_changed().connect(sigc::mem_fun(*this,
&Example_Gestures::on_gesture_rotate_angle_changed));
m_GestureZoom = Gtk::GestureZoom::create(m_DrawingArea);
- m_GestureZoom->set_propagation_phase(Gtk::PHASE_BUBBLE);
+ m_GestureZoom->set_propagation_phase(Gtk::PropagationPhase::BUBBLE);
m_GestureZoom->signal_scale_changed().connect(sigc::mem_fun(*this,
&Example_Gestures::on_gesture_zoom_scale_changed));
}
diff --git a/demos/gtk-demo/example_glarea.cc b/demos/gtk-demo/example_glarea.cc
index e39c518..847f488 100644
--- a/demos/gtk-demo/example_glarea.cc
+++ b/demos/gtk-demo/example_glarea.cc
@@ -37,9 +37,9 @@ public:
~Example_GLArea() override;
protected:
- Gtk::Box m_VBox {Gtk::ORIENTATION_VERTICAL, false};
+ Gtk::Box m_VBox {Gtk::Orientation::VERTICAL, false};
Gtk::GLArea m_GLArea;
- Gtk::Box m_Controls {Gtk::ORIENTATION_VERTICAL, false};
+ Gtk::Box m_Controls {Gtk::Orientation::VERTICAL, false};
Gtk::Button m_Button {"Quit"};
GLuint m_Vao {0};
@@ -170,7 +170,7 @@ bool Example_GLArea::render(const Glib::RefPtr<Gdk::GLContext>& /* context */)
Gtk::Box* Example_GLArea::create_axis_slider_box(int axis)
{
- auto box = Gtk::manage(new Gtk::Box{Gtk::ORIENTATION_HORIZONTAL, false});
+ auto box = Gtk::manage(new Gtk::Box{Gtk::Orientation::HORIZONTAL, false});
const char* text;
@@ -206,7 +206,7 @@ Gtk::Box* Example_GLArea::create_axis_slider_box(int axis)
adj->signal_value_changed().connect(
sigc::bind(sigc::mem_fun(*this, &Example_GLArea::on_axis_value_change), axis, adj)
);
- auto slider = Gtk::manage(new Gtk::Scale{adj, Gtk::ORIENTATION_HORIZONTAL});
+ auto slider = Gtk::manage(new Gtk::Scale{adj, Gtk::Orientation::HORIZONTAL});
box->add(*slider);
slider->set_hexpand(true);
slider->show();
diff --git a/demos/gtk-demo/example_headerbar.cc b/demos/gtk-demo/example_headerbar.cc
index da6d2a6..b81c582 100644
--- a/demos/gtk-demo/example_headerbar.cc
+++ b/demos/gtk-demo/example_headerbar.cc
@@ -47,7 +47,7 @@ Gtk::Window* do_headerbar()
}
Example_HeaderBar::Example_HeaderBar()
-: m_arrow_buttons_box(Gtk::ORIENTATION_HORIZONTAL)
+: m_arrow_buttons_box(Gtk::Orientation::HORIZONTAL)
{
// Window properties
// Window title is set by header bar
@@ -82,7 +82,7 @@ void Example_HeaderBar::configure_send_receive_button()
GTKMM_DISABLE_DEPRECATED on g++ */
auto icon = Gio::ThemedIcon::create("mail-send-receive-symbolic", false);
- m_send_receive_image.set(icon, Gtk::ICON_SIZE_BUTTON);
+ m_send_receive_image.set(icon, Gtk::BuiltinIconSize::BUTTON);
m_send_receive_button.add(m_send_receive_image);
}
@@ -90,8 +90,8 @@ void Example_HeaderBar::configure_arrow_buttons()
{
m_arrow_buttons_box.get_style_context()->add_class("linked");
- m_left_arrow_button.set_image_from_icon_name("pan-start-symbolic", Gtk::ICON_SIZE_BUTTON, true);
- m_right_arrow_button.set_image_from_icon_name("pan-end-symbolic", Gtk::ICON_SIZE_BUTTON, true);
+ m_left_arrow_button.set_image_from_icon_name("pan-start-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
+ m_right_arrow_button.set_image_from_icon_name("pan-end-symbolic", Gtk::BuiltinIconSize::BUTTON, true);
m_arrow_buttons_box.add(m_left_arrow_button);
m_arrow_buttons_box.add(m_right_arrow_button);
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index 095a998..53524c0 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -177,12 +177,12 @@ Gtk::Window* do_iconbrowser()
// Definition of main window methods.
Example_IconBrowser::Example_IconBrowser()
:
- m_header_radio_button_box(Gtk::ORIENTATION_HORIZONTAL, 0),
+ m_header_radio_button_box(Gtk::Orientation::HORIZONTAL, 0),
m_normal_radio("Normal"),
m_symbolic_radio("Symbolic"),
- m_hbox(Gtk::ORIENTATION_HORIZONTAL, 0),
- m_vseparator(Gtk::ORIENTATION_VERTICAL),
- m_vcontent_box(Gtk::ORIENTATION_VERTICAL, 0),
+ m_hbox(Gtk::Orientation::HORIZONTAL, 0),
+ m_vseparator(Gtk::Orientation::VERTICAL),
+ m_vcontent_box(Gtk::Orientation::VERTICAL, 0),
m_details(*this)
{
//set_title("Icon Browser"); // Not shown when header bar is shown
@@ -196,7 +196,7 @@ Example_IconBrowser::Example_IconBrowser()
m_header.set_title("Icon Browser");
m_header.set_show_close_button(true);
m_header.pack_end(m_search_button);
- m_search_button.set_image_from_icon_name("edit-find-symbolic", Gtk::ICON_SIZE_MENU);
+ m_search_button.set_image_from_icon_name("edit-find-symbolic", Gtk::BuiltinIconSize::MENU);
m_header.pack_end(m_header_radio_button_box);
m_header_radio_button_box.pack_start(m_normal_radio);
m_header_radio_button_box.pack_start(m_symbolic_radio);
@@ -204,7 +204,7 @@ Example_IconBrowser::Example_IconBrowser()
m_symbolic_radio.set_draw_indicator(false);
m_symbolic_radio.join_group(m_normal_radio);
- m_button_size_group = Gtk::SizeGroup::create(Gtk::SIZE_GROUP_VERTICAL);
+ m_button_size_group = Gtk::SizeGroup::create(Gtk::SizeGroupMode::VERTICAL);
m_button_size_group->add_widget(m_normal_radio);
m_button_size_group->add_widget(m_symbolic_radio);
m_button_size_group->add_widget(m_search_button);
@@ -212,7 +212,7 @@ Example_IconBrowser::Example_IconBrowser()
// Main part of the window.
add(m_hbox);
m_hbox.pack_start(m_context_list, Gtk::PACK_SHRINK);
- m_context_list.set_selection_mode(Gtk::SELECTION_SINGLE);
+ m_context_list.set_selection_mode(Gtk::SelectionMode::SINGLE);
m_hbox.pack_start(m_vseparator, Gtk::PACK_SHRINK);
m_hbox.pack_start(m_vcontent_box);
m_vcontent_box.pack_start(m_search_bar, Gtk::PACK_SHRINK);
@@ -221,23 +221,23 @@ Example_IconBrowser::Example_IconBrowser()
m_binding_search_button_search_entry = Glib::Binding::bind_property(
m_search_button.property_active(),
m_search_bar.property_search_mode_enabled(),
- Glib::BINDING_BIDIRECTIONAL);
+ Glib::BindingFlags::BIDIRECTIONAL);
m_vcontent_box.pack_start(m_scrolled_window);
- m_scrolled_window.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ m_scrolled_window.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
m_scrolled_window.add(m_icon_view);
m_icon_view.set_model(m_filter_model);
- m_icon_view.set_selection_mode(Gtk::SELECTION_NONE);
+ m_icon_view.set_selection_mode(Gtk::SelectionMode::NONE);
m_icon_view.set_activate_on_single_click(true);
m_icon_view.pack_start(m_icon_cell);
m_icon_view.pack_start(m_text_cell);
m_icon_cell.set_padding(10, 10);
- m_icon_cell.property_stock_size() = Gtk::ICON_SIZE_DND;
+ m_icon_cell.property_stock_size() = static_cast<guint>(Gtk::BuiltinIconSize::DND);
m_text_cell.set_padding(10, 10);
m_text_cell.set_alignment(0.5, 0.5);
// Enable dragging an icon name, and copying it to another program.
m_icon_view.enable_model_drag_source(
- std::vector<Gtk::TargetEntry>(), Gdk::BUTTON1_MASK, Gdk::ACTION_COPY);
+ std::vector<Gtk::TargetEntry>(), Gdk::ModifierType::BUTTON1_MASK, Gdk::DragAction::COPY);
m_icon_view.drag_source_add_text_targets();
m_icon_view.set_has_tooltip(true);
@@ -904,20 +904,20 @@ DetailDialog::DetailDialog(Gtk::Window& parent)
m_grid.attach(m_event_box[i], i, 0, 1, 1);
m_event_box[i].add(m_image[i]);
m_image[i].property_margin() = 4;
- m_image[i].set_halign(Gtk::ALIGN_CENTER);
- m_image[i].set_valign(Gtk::ALIGN_END);
+ m_image[i].set_halign(Gtk::Align::CENTER);
+ m_image[i].set_valign(Gtk::Align::END);
// Enable dragging an image, and copying it to another program.
m_event_box[i].drag_source_set(
- std::vector<Gtk::TargetEntry>(), Gdk::BUTTON1_MASK, Gdk::ACTION_COPY);
+ std::vector<Gtk::TargetEntry>(), Gdk::ModifierType::BUTTON1_MASK, Gdk::DragAction::COPY);
m_event_box[i].drag_source_add_image_targets();
m_event_box[i].signal_drag_data_get().connect(
sigc::bind(sigc::mem_fun(*this, &DetailDialog::on_image_drag_data_get), i));
m_grid.attach(m_label[i], i, 1, 1, 1);
m_label[i].property_margin() = 4;
- m_label[i].set_halign(Gtk::ALIGN_CENTER);
- m_label[i].set_valign(Gtk::ALIGN_CENTER);
+ m_label[i].set_halign(Gtk::Align::CENTER);
+ m_label[i].set_valign(Gtk::Align::CENTER);
std::ostringstream ostr;
ostr << m_icon_size[i] << 'x' << m_icon_size[i];
m_label[i].set_text(ostr.str());
@@ -925,8 +925,8 @@ DetailDialog::DetailDialog(Gtk::Window& parent)
m_grid.attach(m_description, 0, 2, n_icon_sizes, 1);
m_description.set_line_wrap(true);
m_description.set_max_width_chars(60);
- m_description.set_halign(Gtk::ALIGN_START);
- m_description.set_valign(Gtk::ALIGN_START);
+ m_description.set_halign(Gtk::Align::START);
+ m_description.set_valign(Gtk::Align::START);
}
DetailDialog::~DetailDialog()
@@ -940,7 +940,7 @@ void DetailDialog::set_image(
for (int i = 0; i < n_icon_sizes; ++i)
{
- m_image[i].set_from_icon_name(icon_name, Gtk::ICON_SIZE_MENU);
+ m_image[i].set_from_icon_name(icon_name, Gtk::BuiltinIconSize::MENU);
m_image[i].set_pixel_size(m_icon_size[i]);
m_event_box[i].drag_source_set_icon(get_icon(i));
}
diff --git a/demos/gtk-demo/example_iconview.cc b/demos/gtk-demo/example_iconview.cc
index ef0083e..43545cc 100644
--- a/demos/gtk-demo/example_iconview.cc
+++ b/demos/gtk-demo/example_iconview.cc
@@ -60,7 +60,7 @@ Gtk::Window* do_iconview()
}
Example_IconView::Example_IconView()
-: m_VBox(Gtk::ORIENTATION_VERTICAL),
+: m_VBox(Gtk::Orientation::VERTICAL),
m_ButtonUp(),
m_ButtonHome()
{
@@ -90,22 +90,22 @@ Example_IconView::Example_IconView()
m_ButtonHome.set_sensitive();
m_Toolbar.append(m_ButtonHome);
- m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_ETCHED_IN);
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow, Gtk::PACK_EXPAND_WIDGET);
//Create the data model:
m_model = Gtk::ListStore::create(m_columns);
m_model->set_default_sort_func( sigc::mem_fun(*this, &Example_IconView::on_model_sort) );
- m_model->set_sort_column(Gtk::TreeSortable::DEFAULT_SORT_COLUMN_ID, Gtk::SORT_ASCENDING);
+ m_model->set_sort_column(Gtk::TreeSortable::DEFAULT_SORT_COLUMN_ID, Gtk::SortType::ASCENDING);
/* and fill it with the contents of '/' */
m_parent = "/";
fill_store();
m_IconView.set_model(m_model);
- m_IconView.set_selection_mode(Gtk::SELECTION_MULTIPLE);
+ m_IconView.set_selection_mode(Gtk::SelectionMode::MULTIPLE);
//Connect signals:
m_ButtonUp.signal_clicked().connect( sigc::mem_fun(*this, &Example_IconView::on_button_up) );
@@ -191,7 +191,7 @@ void Example_IconView::fill_store()
if (name[0] != '.')
{
auto path = Glib::build_filename(m_parent, name);
- bool is_dir = Glib::file_test(path, Glib::FILE_TEST_IS_DIR);
+ bool is_dir = Glib::file_test(path, Glib::FileTest::IS_DIR);
auto display_name = Glib::filename_to_utf8(name);
diff --git a/demos/gtk-demo/example_images.cc b/demos/gtk-demo/example_images.cc
index 377d54f..06e4838 100644
--- a/demos/gtk-demo/example_images.cc
+++ b/demos/gtk-demo/example_images.cc
@@ -46,7 +46,7 @@ Gtk::Window* do_images()
Example_Images::Example_Images()
:
- m_VBox (Gtk::ORIENTATION_VERTICAL, 8),
+ m_VBox (Gtk::Orientation::VERTICAL, 8),
m_image_stream ()
{
set_title("Images");
@@ -59,10 +59,10 @@ Example_Images::Example_Images()
m_Label_Image.set_markup("<u>Image loaded from a file</u>");
m_VBox.pack_start(m_Label_Image, Gtk::PACK_SHRINK);
- m_Frame_Image.set_shadow_type(Gtk::SHADOW_IN);
+ m_Frame_Image.set_shadow_type(Gtk::ShadowType::IN);
- m_Frame_Image.set_halign(Gtk::ALIGN_CENTER);
- m_Frame_Image.set_valign(Gtk::ALIGN_CENTER);
+ m_Frame_Image.set_halign(Gtk::Align::CENTER);
+ m_Frame_Image.set_valign(Gtk::Align::CENTER);
m_VBox.pack_start(m_Frame_Image, Gtk::PACK_SHRINK);
auto pImage = Gtk::manage(new Gtk::Image());
@@ -74,10 +74,10 @@ Example_Images::Example_Images()
m_Label_Animation.set_markup("<u>Animation loaded from a file</u>");
m_VBox.pack_start(m_Label_Animation, Gtk::PACK_SHRINK);
- m_Frame_Animation.set_shadow_type(Gtk::SHADOW_IN);
+ m_Frame_Animation.set_shadow_type(Gtk::ShadowType::IN);
- m_Frame_Animation.set_halign(Gtk::ALIGN_CENTER);
- m_Frame_Animation.set_valign(Gtk::ALIGN_CENTER);
+ m_Frame_Animation.set_halign(Gtk::Align::CENTER);
+ m_Frame_Animation.set_valign(Gtk::Align::CENTER);
m_VBox.pack_start(m_Frame_Animation, Gtk::PACK_SHRINK);
pImage = Gtk::manage(new Gtk::Image());
@@ -89,7 +89,7 @@ Example_Images::Example_Images()
m_Label_Progressive.set_markup("<u>Progressive image loading</u>");
m_VBox.pack_start(m_Label_Progressive, Gtk::PACK_SHRINK);
- m_Frame_Progressive.set_shadow_type(Gtk::SHADOW_IN);
+ m_Frame_Progressive.set_shadow_type(Gtk::ShadowType::IN);
m_VBox.pack_start(m_Frame_Progressive, Gtk::PACK_SHRINK);
@@ -141,7 +141,7 @@ bool Example_Images::on_timeout()
Glib::ustring strMsg = "Failure reading image 'alphatest.png': ";
strMsg += error.what();
- Gtk::MessageDialog dialog(strMsg, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE);
+ Gtk::MessageDialog dialog(strMsg, false, Gtk::MessageType::ERROR, Gtk::ButtonsType::CLOSE);
dialog.run();
m_image_stream.reset();
@@ -158,7 +158,7 @@ bool Example_Images::on_timeout()
Glib::ustring strMsg = "Failed to load image: ";
strMsg += error.what();
- Gtk::MessageDialog dialog(strMsg, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE);
+ Gtk::MessageDialog dialog(strMsg, false, Gtk::MessageType::ERROR, Gtk::ButtonsType::CLOSE);
dialog.run();
m_image_stream.reset();
@@ -184,7 +184,7 @@ bool Example_Images::on_timeout()
Glib::ustring strMsg = "Failed to close image: ";
strMsg += error.what();
- Gtk::MessageDialog dialog(strMsg, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE);
+ Gtk::MessageDialog dialog(strMsg, false, Gtk::MessageType::ERROR, Gtk::ButtonsType::CLOSE);
dialog.run();
m_refPixbufLoader.reset();
@@ -206,7 +206,7 @@ bool Example_Images::on_timeout()
Glib::ustring strMsg = "Unable to open image 'alphatest.png': ";
strMsg += error.what();
- Gtk::MessageDialog dialog(strMsg, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE);
+ Gtk::MessageDialog dialog(strMsg, false, Gtk::MessageType::ERROR, Gtk::ButtonsType::CLOSE);
dialog.run();
return false; // uninstall the timeout
diff --git a/demos/gtk-demo/example_menus.cc b/demos/gtk-demo/example_menus.cc
index 51620e2..c31fd03 100644
--- a/demos/gtk-demo/example_menus.cc
+++ b/demos/gtk-demo/example_menus.cc
@@ -53,10 +53,10 @@ Gtk::Window* do_menus()
}
Example_Menus::Example_Menus()
-: m_VBox1(Gtk::ORIENTATION_VERTICAL),
- m_VBox_Sub1(Gtk::ORIENTATION_VERTICAL, 10),
- m_VBox_Sub2(Gtk::ORIENTATION_VERTICAL, 10),
- m_Separator(Gtk::ORIENTATION_HORIZONTAL),
+: m_VBox1(Gtk::Orientation::VERTICAL),
+ m_VBox_Sub1(Gtk::Orientation::VERTICAL, 10),
+ m_VBox_Sub2(Gtk::Orientation::VERTICAL, 10),
+ m_Separator(Gtk::Orientation::HORIZONTAL),
m_Button("close")
{
set_title("menus");
@@ -96,18 +96,18 @@ Example_Menus::Example_Menus()
pMenuItem->show();
pMenuItem = Gtk::manage(new Gtk::CheckMenuItem("Accelerate Me"));
- pMenuItem->add_accelerator("activate", get_accel_group(), GDK_KEY_F1, Gdk::ModifierType(0),
Gtk::ACCEL_VISIBLE );
+ pMenuItem->add_accelerator("activate", get_accel_group(), GDK_KEY_F1, Gdk::ModifierType(0),
Gtk::AccelFlags::VISIBLE);
pMenu->append(*pMenuItem);
pMenuItem->show();
pMenuItem = Gtk::manage(new Gtk::CheckMenuItem("Accelerator Locked"));
pMenu->append(*pMenuItem);
- pMenuItem->add_accelerator("activate", get_accel_group(), GDK_KEY_F2, Gdk::ModifierType(0),
Gtk::ACCEL_VISIBLE | Gtk::ACCEL_LOCKED);
+ pMenuItem->add_accelerator("activate", get_accel_group(), GDK_KEY_F2, Gdk::ModifierType(0),
Gtk::AccelFlags::VISIBLE | Gtk::AccelFlags::LOCKED);
pMenuItem->show();
pMenuItem = Gtk::manage(new Gtk::CheckMenuItem("Accelerator Frozen"));
pMenu->append(*pMenuItem);
- pMenuItem->add_accelerator("activate", get_accel_group(), GDK_KEY_F2, Gdk::ModifierType(0),
Gtk::ACCEL_VISIBLE);
+ pMenuItem->add_accelerator("activate", get_accel_group(), GDK_KEY_F2, Gdk::ModifierType(0),
Gtk::AccelFlags::VISIBLE);
pMenuItem->show();
}
diff --git a/demos/gtk-demo/example_overlay.cc b/demos/gtk-demo/example_overlay.cc
index f0f9dce..d576bd7 100644
--- a/demos/gtk-demo/example_overlay.cc
+++ b/demos/gtk-demo/example_overlay.cc
@@ -39,7 +39,7 @@ Example_Overlay::Example_Overlay()
set_title("Overlay");
// Main 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_scrolled_window.add(m_text_view);
// Entries and labels
@@ -71,48 +71,48 @@ void Example_Overlay::configure_entries_and_labels()
}
// Then we set align attributes
- m_entries[0].set_halign(Gtk::ALIGN_END);
- m_entries[0].set_valign(Gtk::ALIGN_END);
- m_labels[0].set_halign(Gtk::ALIGN_END);
- m_labels[0].set_valign(Gtk::ALIGN_END);
-
- m_entries[1].set_halign(Gtk::ALIGN_START);
- m_entries[1].set_valign(Gtk::ALIGN_END);
- m_labels[1].set_halign(Gtk::ALIGN_START);
- m_labels[1].set_valign(Gtk::ALIGN_END);
-
- m_entries[2].set_halign(Gtk::ALIGN_END);
- m_entries[2].set_valign(Gtk::ALIGN_START);
- m_labels[2].set_halign(Gtk::ALIGN_END);
- m_labels[2].set_valign(Gtk::ALIGN_START);
-
- m_entries[3].set_halign(Gtk::ALIGN_START);
- m_entries[3].set_valign(Gtk::ALIGN_START);
- m_labels[3].set_halign(Gtk::ALIGN_START);
- m_labels[3].set_valign(Gtk::ALIGN_START);
-
- m_entries[4].set_halign(Gtk::ALIGN_END);
- m_entries[4].set_valign(Gtk::ALIGN_CENTER);
- m_labels[4].set_halign(Gtk::ALIGN_END);
- m_labels[4].set_valign(Gtk::ALIGN_CENTER);
-
- m_entries[5].set_halign(Gtk::ALIGN_START);
- m_entries[5].set_valign(Gtk::ALIGN_CENTER);
- m_labels[5].set_halign(Gtk::ALIGN_START);
- m_labels[5].set_valign(Gtk::ALIGN_CENTER);
-
- m_entries[6].set_halign(Gtk::ALIGN_CENTER);
- m_entries[6].set_valign(Gtk::ALIGN_START);
- m_labels[6].set_halign(Gtk::ALIGN_CENTER);
- m_labels[6].set_valign(Gtk::ALIGN_START);
-
- m_entries[7].set_halign(Gtk::ALIGN_CENTER);
- m_entries[7].set_valign(Gtk::ALIGN_END);
- m_labels[7].set_halign(Gtk::ALIGN_CENTER);
- m_labels[7].set_valign(Gtk::ALIGN_END);
-
- m_entries[8].set_halign(Gtk::ALIGN_CENTER);
- m_entries[8].set_valign(Gtk::ALIGN_CENTER);
- m_labels[8].set_halign(Gtk::ALIGN_CENTER);
- m_labels[8].set_valign(Gtk::ALIGN_CENTER);
+ m_entries[0].set_halign(Gtk::Align::END);
+ m_entries[0].set_valign(Gtk::Align::END);
+ m_labels[0].set_halign(Gtk::Align::END);
+ m_labels[0].set_valign(Gtk::Align::END);
+
+ m_entries[1].set_halign(Gtk::Align::START);
+ m_entries[1].set_valign(Gtk::Align::END);
+ m_labels[1].set_halign(Gtk::Align::START);
+ m_labels[1].set_valign(Gtk::Align::END);
+
+ m_entries[2].set_halign(Gtk::Align::END);
+ m_entries[2].set_valign(Gtk::Align::START);
+ m_labels[2].set_halign(Gtk::Align::END);
+ m_labels[2].set_valign(Gtk::Align::START);
+
+ m_entries[3].set_halign(Gtk::Align::START);
+ m_entries[3].set_valign(Gtk::Align::START);
+ m_labels[3].set_halign(Gtk::Align::START);
+ m_labels[3].set_valign(Gtk::Align::START);
+
+ m_entries[4].set_halign(Gtk::Align::END);
+ m_entries[4].set_valign(Gtk::Align::CENTER);
+ m_labels[4].set_halign(Gtk::Align::END);
+ m_labels[4].set_valign(Gtk::Align::CENTER);
+
+ m_entries[5].set_halign(Gtk::Align::START);
+ m_entries[5].set_valign(Gtk::Align::CENTER);
+ m_labels[5].set_halign(Gtk::Align::START);
+ m_labels[5].set_valign(Gtk::Align::CENTER);
+
+ m_entries[6].set_halign(Gtk::Align::CENTER);
+ m_entries[6].set_valign(Gtk::Align::START);
+ m_labels[6].set_halign(Gtk::Align::CENTER);
+ m_labels[6].set_valign(Gtk::Align::START);
+
+ m_entries[7].set_halign(Gtk::Align::CENTER);
+ m_entries[7].set_valign(Gtk::Align::END);
+ m_labels[7].set_halign(Gtk::Align::CENTER);
+ m_labels[7].set_valign(Gtk::Align::END);
+
+ m_entries[8].set_halign(Gtk::Align::CENTER);
+ m_entries[8].set_valign(Gtk::Align::CENTER);
+ m_labels[8].set_halign(Gtk::Align::CENTER);
+ m_labels[8].set_valign(Gtk::Align::CENTER);
}
diff --git a/demos/gtk-demo/example_panes.cc b/demos/gtk-demo/example_panes.cc
index 037ebef..32c7ed1 100644
--- a/demos/gtk-demo/example_panes.cc
+++ b/demos/gtk-demo/example_panes.cc
@@ -48,30 +48,30 @@ Example_Panes::Example_Panes()
{
set_title("Panes");
- Gtk::Box *const pVBox = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
+ Gtk::Box *const pVBox = new Gtk::Box(Gtk::Orientation::VERTICAL);
add(*Gtk::manage(pVBox));
- Gtk::Paned *const pVPaned = new Gtk::Paned(Gtk::ORIENTATION_VERTICAL);
+ Gtk::Paned *const pVPaned = new Gtk::Paned(Gtk::Orientation::VERTICAL);
pVBox->pack_start(*Gtk::manage(pVPaned));
pVPaned->property_margin() = 5;
- Gtk::Paned *const pHPaned = new Gtk::Paned(Gtk::ORIENTATION_HORIZONTAL);
+ Gtk::Paned *const pHPaned = new Gtk::Paned(Gtk::Orientation::HORIZONTAL);
pVPaned->add1(*Gtk::manage(pHPaned));
Gtk::Frame *const pFrame1 = new Gtk::Frame();
pHPaned->add1(*Gtk::manage(pFrame1));
- pFrame1->set_shadow_type(Gtk::SHADOW_IN);
+ pFrame1->set_shadow_type(Gtk::ShadowType::IN);
pFrame1->set_size_request(60, 60);
pFrame1->add(*Gtk::manage(new Gtk::Button("_Hi there", true)));
Gtk::Frame *const pFrame2 = new Gtk::Frame();
pHPaned->add2(*Gtk::manage(pFrame2));
- pFrame2->set_shadow_type(Gtk::SHADOW_IN);
+ pFrame2->set_shadow_type(Gtk::ShadowType::IN);
pFrame2->set_size_request(80, 60);
Gtk::Frame *const pFrame3 = new Gtk::Frame();
pVPaned->add2(*Gtk::manage(pFrame3));
- pFrame3->set_shadow_type(Gtk::SHADOW_IN);
+ pFrame3->set_shadow_type(Gtk::ShadowType::IN);
pFrame3->set_size_request(60, 80);
// Now create check buttons to control sizing
diff --git a/demos/gtk-demo/example_pixbufs.cc b/demos/gtk-demo/example_pixbufs.cc
index f3a5685..d018758 100644
--- a/demos/gtk-demo/example_pixbufs.cc
+++ b/demos/gtk-demo/example_pixbufs.cc
@@ -83,7 +83,7 @@ Example_Pixbufs::Example_Pixbufs()
load_pixbufs();
set_size_request(m_back_width, m_back_height);
- m_refPixbuf = Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, FALSE, 8, m_back_width, m_back_height);
+ m_refPixbuf = Gdk::Pixbuf::create(Gdk::Colorspace::RGB, FALSE, 8, m_back_width, m_back_height);
m_DrawingArea.set_draw_func(sigc::mem_fun(*this, &Example_Pixbufs::on_drawingarea_draw));
add(m_DrawingArea);
@@ -95,7 +95,7 @@ Example_Pixbufs::Example_Pixbufs()
Glib::ustring strMsg = "Failed to load an image: ";
strMsg += error.what();
- Gtk::MessageDialog dialog(strMsg, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE);
+ Gtk::MessageDialog dialog(strMsg, false, Gtk::MessageType::ERROR, Gtk::ButtonsType::CLOSE);
dialog.run();
}
}
@@ -184,7 +184,7 @@ bool Example_Pixbufs::on_timeout()
dest.width, dest.height,
xpos, ypos,
k, k,
- Gdk::INTERP_NEAREST,
+ Gdk::InterpType::NEAREST,
(int)((i & 1)
? MAX (127, fabs (255 * sin (f * 2.0 * M_PI)))
: MAX (127, fabs (255 * cos (f * 2.0 * M_PI)))));
diff --git a/demos/gtk-demo/example_sizegroup.cc b/demos/gtk-demo/example_sizegroup.cc
index 8598659..21af886 100644
--- a/demos/gtk-demo/example_sizegroup.cc
+++ b/demos/gtk-demo/example_sizegroup.cc
@@ -51,17 +51,17 @@ Example_SizeGroup::Example_SizeGroup()
: Gtk::Dialog("Gtk::SizeGroup"),
m_Frame_Color("Color Options"),
m_Frame_Line("Line Options"),
- m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
- m_HBox(Gtk::ORIENTATION_HORIZONTAL, 5),
+ m_VBox(Gtk::Orientation::VERTICAL, 5),
+ m_HBox(Gtk::Orientation::HORIZONTAL, 5),
m_CheckButton("_Enable grouping", true)
{
set_resizable(false);
- add_button("_Close", Gtk::RESPONSE_CLOSE);
+ add_button("_Close", Gtk::ResponseType::CLOSE);
get_content_area()->pack_start(m_VBox);
m_VBox.property_margin() = 5;
- m_refSizeGroup = Gtk::SizeGroup::create(Gtk::SIZE_GROUP_HORIZONTAL),
+ m_refSizeGroup = Gtk::SizeGroup::create(Gtk::SizeGroupMode::HORIZONTAL),
/* Create one frame holding color options
*/
@@ -116,12 +116,12 @@ Example_SizeGroup::~Example_SizeGroup()
void Example_SizeGroup::on_checkbutton_toggled()
{
- auto new_mode = Gtk::SIZE_GROUP_HORIZONTAL;
+ auto new_mode = Gtk::SizeGroupMode::HORIZONTAL;
if(m_CheckButton.get_active())
- new_mode = Gtk::SIZE_GROUP_HORIZONTAL;
+ new_mode = Gtk::SizeGroupMode::HORIZONTAL;
else
- new_mode = Gtk::SIZE_GROUP_NONE;
+ new_mode = Gtk::SizeGroupMode::NONE;
m_refSizeGroup->set_mode(new_mode);
}
@@ -131,7 +131,7 @@ void Example_SizeGroup::add_row(Gtk::Grid& grid, int row,
const Glib::ustring& label_text,
const std::list<Glib::ustring>& options)
{
- auto pLabel = Gtk::manage(new Gtk::Label(label_text, Gtk::ALIGN_START, Gtk::ALIGN_END, true));
+ auto pLabel = Gtk::manage(new Gtk::Label(label_text, Gtk::Align::START, Gtk::Align::END, true));
grid.attach(*pLabel, 0, row, 1, 1);
pLabel->set_hexpand();
diff --git a/demos/gtk-demo/example_stack.cc b/demos/gtk-demo/example_stack.cc
index ede1667..6ca5934 100644
--- a/demos/gtk-demo/example_stack.cc
+++ b/demos/gtk-demo/example_stack.cc
@@ -46,18 +46,18 @@ Example_Stack::Example_Stack()
m_stack.add(m_spinner, "page3");
// Page 1
- m_image.set_from_icon_name("gtk3-demo", Gtk::ICON_SIZE_DIALOG);
+ m_image.set_from_icon_name("gtk3-demo", Gtk::BuiltinIconSize::DIALOG);
// Page 2
m_check_button.set_label("Page 2");
- m_check_button.set_halign(Gtk::ALIGN_CENTER);
+ m_check_button.set_halign(Gtk::Align::CENTER);
// Page 3
m_stack.child_property_icon_name(m_spinner) = "face-laugh-symbolic";
m_spinner.property_active() = true;
// Stack transition
- m_stack.set_transition_type(Gtk::STACK_TRANSITION_TYPE_CROSSFADE);
+ m_stack.set_transition_type(Gtk::StackTransitionType::CROSSFADE);
// Layout
m_stack_switcher.set_stack(m_stack);
diff --git a/demos/gtk-demo/example_stacksidebar.cc b/demos/gtk-demo/example_stacksidebar.cc
index 3a50396..cd99128 100644
--- a/demos/gtk-demo/example_stacksidebar.cc
+++ b/demos/gtk-demo/example_stacksidebar.cc
@@ -37,10 +37,10 @@ Gtk::Window* do_stacksidebar()
Example_StackSidebar::Example_StackSidebar()
:
- m_Box(Gtk::ORIENTATION_HORIZONTAL),
+ m_Box(Gtk::Orientation::HORIZONTAL),
m_HeaderBar(),
m_StackSidebar(),
- m_Separator(Gtk::ORIENTATION_VERTICAL),
+ m_Separator(Gtk::Orientation::VERTICAL),
m_Stack()
{
m_HeaderBar.set_show_close_button(true);
@@ -54,7 +54,7 @@ Example_StackSidebar::Example_StackSidebar()
m_Box.pack_start(m_Separator, Gtk::PACK_SHRINK);
m_Box.pack_start(m_Stack, Gtk::PACK_EXPAND_WIDGET);
- m_Stack.set_transition_type(Gtk::STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
+ m_Stack.set_transition_type(Gtk::StackTransitionType::SLIDE_UP_DOWN);
m_StackSidebar.set_stack(m_Stack);
// Stack pages
@@ -65,7 +65,7 @@ Example_StackSidebar::Example_StackSidebar()
if (i == 0)
{
auto image = Gtk::manage(new Gtk::Image());
- image->set_from_icon_name("help-about", Gtk::ICON_SIZE_MENU);
+ image->set_from_icon_name("help-about", Gtk::BuiltinIconSize::MENU);
image->set_pixel_size(256);
widget = image;
}
diff --git a/demos/gtk-demo/example_textview.cc b/demos/gtk-demo/example_textview.cc
index af37dbd..3d38651 100644
--- a/demos/gtk-demo/example_textview.cc
+++ b/demos/gtk-demo/example_textview.cc
@@ -62,7 +62,7 @@ Gtk::Window* do_textview()
}
Example_TextView::Example_TextView()
-: m_VPaned(Gtk::ORIENTATION_VERTICAL)
+: m_VPaned(Gtk::Orientation::VERTICAL)
{
set_default_size(450, 450);
set_title("Text View");
@@ -78,11 +78,11 @@ Example_TextView::Example_TextView()
auto refBuffer = m_View1.get_buffer();
m_pView2 = Gtk::manage( new Gtk::TextView(refBuffer) );
- m_ScrolledWindow1.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow1.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VPaned.add1(m_ScrolledWindow1);
m_ScrolledWindow1.add(m_View1);
- m_ScrolledWindow2.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow2.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VPaned.add2(m_ScrolledWindow2);
m_ScrolledWindow2.add(*m_pView2);
@@ -120,11 +120,11 @@ void Example_TextView::create_tags(Glib::RefPtr<Gtk::TextBuffer>& refBuffer)
Glib::RefPtr<Gtk::TextBuffer::Tag> refTag;
refTag = refBuffer->create_tag("heading");
- refTag->property_weight() = Pango::WEIGHT_BOLD;
+ refTag->property_weight() = static_cast<int>(Pango::Weight::BOLD);
refTag->property_size() = 15 * Pango::SCALE;
- refBuffer->create_tag("italic")->property_style() = Pango::STYLE_ITALIC;
- refBuffer->create_tag("bold")->property_weight() = Pango::WEIGHT_BOLD;
+ refBuffer->create_tag("italic")->property_style() = Pango::Style::ITALIC;
+ refBuffer->create_tag("bold")->property_weight() = static_cast<int>(Pango::Weight::BOLD);
refBuffer->create_tag("big")->property_size() = 20 * Pango::SCALE;
refBuffer->create_tag("xx-small")->property_scale() = Pango::SCALE_XX_SMALL;
refBuffer->create_tag("x-large")->property_scale() = Pango::SCALE_X_LARGE;
@@ -136,19 +136,19 @@ void Example_TextView::create_tags(Glib::RefPtr<Gtk::TextBuffer>& refBuffer)
refBuffer->create_tag("big_gap_after_line")->property_pixels_below_lines() = 30;
refBuffer->create_tag("double_spaced_line")->property_pixels_inside_wrap() = 10;
refBuffer->create_tag("not_editable")->property_editable() = FALSE;
- refBuffer->create_tag("word_wrap")->property_wrap_mode() = Gtk::WRAP_WORD;
- refBuffer->create_tag("char_wrap")->property_wrap_mode() = Gtk::WRAP_CHAR;
- refBuffer->create_tag("no_wrap")->property_wrap_mode() = Gtk::WRAP_NONE;
- refBuffer->create_tag("center")->property_justification() = Gtk::JUSTIFY_CENTER;
- refBuffer->create_tag("right_justify")->property_justification() = Gtk::JUSTIFY_RIGHT;
+ refBuffer->create_tag("word_wrap")->property_wrap_mode() = Gtk::WrapMode::WORD;
+ refBuffer->create_tag("char_wrap")->property_wrap_mode() = Gtk::WrapMode::CHAR;
+ refBuffer->create_tag("no_wrap")->property_wrap_mode() = Gtk::WrapMode::NONE;
+ refBuffer->create_tag("center")->property_justification() = Gtk::Justification::CENTER;
+ refBuffer->create_tag("right_justify")->property_justification() = Gtk::Justification::RIGHT;
refTag = refBuffer->create_tag("wide_margins");
refTag->property_left_margin() = 50;
refTag->property_right_margin() = 50;
refBuffer->create_tag("strikethrough")->property_strikethrough() = true;
- refBuffer->create_tag("underline")->property_underline() = Pango::UNDERLINE_SINGLE;
- refBuffer->create_tag("double_underline")->property_underline() = Pango::UNDERLINE_DOUBLE;
+ refBuffer->create_tag("underline")->property_underline() = Pango::Underline::SINGLE;
+ refBuffer->create_tag("double_underline")->property_underline() = Pango::Underline::DOUBLE;
refTag = refBuffer->create_tag("superscript");
refTag->property_rise() = 10 * Pango::SCALE; /* 10 pixels */
@@ -159,8 +159,8 @@ void Example_TextView::create_tags(Glib::RefPtr<Gtk::TextBuffer>& refBuffer)
refTag->property_size() = 8 * Pango::SCALE; /* 8 points */
refTag = refBuffer->create_tag("rtl_quote");
- refTag->property_wrap_mode() = Gtk::WRAP_WORD;
- refTag->property_direction() = Gtk::TEXT_DIR_RTL;
+ refTag->property_wrap_mode() = Gtk::WrapMode::WORD;
+ refTag->property_direction() = Gtk::TextDirection::RTL;
refTag->property_indent() = 30;
refTag->property_left_margin() = 20;
refTag->property_right_margin() = 20;
@@ -172,7 +172,7 @@ void Example_TextView::insert_text(Glib::RefPtr<Gtk::TextBuffer>& refBuffer)
try
{
refPixbuf = Gdk::Pixbuf::create_from_resource("/textview/gtk-logo-rgb.gif");
- auto refScaled = refPixbuf->scale_simple(32, 32, Gdk::INTERP_BILINEAR);
+ auto refScaled = refPixbuf->scale_simple(32, 32, Gdk::InterpType::BILINEAR);
refPixbuf = refScaled;
}
catch (const Glib::Error& error)
@@ -400,7 +400,7 @@ void Example_TextView::attach_widgets(Gtk::TextView& text_view)
}
else if (i == 2)
{
- auto pHScale = Gtk::manage( new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL) );
+ auto pHScale = Gtk::manage( new Gtk::Scale(Gtk::Orientation::HORIZONTAL) );
pHScale->set_range(0, 100);
pHScale->set_size_request(70, -1);
@@ -451,7 +451,7 @@ Window_EasterEgg::Window_EasterEgg()
recursive_attach_view(0, *m_pTextView, refAnchor);
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
add(m_ScrolledWindow);
m_ScrolledWindow.add(*m_pTextView);
diff --git a/demos/gtk-demo/example_treeview_editable_cells.cc
b/demos/gtk-demo/example_treeview_editable_cells.cc
index 8e27f83..54e17ef 100644
--- a/demos/gtk-demo/example_treeview_editable_cells.cc
+++ b/demos/gtk-demo/example_treeview_editable_cells.cc
@@ -97,9 +97,9 @@ Gtk::Window* do_treeview_editable_cells()
Example_TreeView_EditableCells::Example_TreeView_EditableCells()
-: m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
+: m_VBox(Gtk::Orientation::VERTICAL, 5),
m_Label("Shopping list (you can edit the cells!)"),
- m_HBox(Gtk::ORIENTATION_HORIZONTAL, 4),
+ m_HBox(Gtk::Orientation::HORIZONTAL, 4),
m_Button_Add("Add item"),
m_Button_Remove("Remove item")
{
@@ -110,8 +110,8 @@ Example_TreeView_EditableCells::Example_TreeView_EditableCells()
add(m_VBox);
m_VBox.pack_start(m_Label, Gtk::PACK_SHRINK);
- m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_ETCHED_IN);
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
/* create model */
@@ -120,7 +120,7 @@ Example_TreeView_EditableCells::Example_TreeView_EditableCells()
/* create tree view */
m_TreeView.set_model(m_refListStore);
auto refTreeSelection = m_TreeView.get_selection();
- refTreeSelection->set_mode(Gtk::SELECTION_SINGLE);
+ refTreeSelection->set_mode(Gtk::SelectionMode::SINGLE);
add_columns();
m_ScrolledWindow.add(m_TreeView);
diff --git a/demos/gtk-demo/example_treeview_liststore.cc b/demos/gtk-demo/example_treeview_liststore.cc
index d09f018..befaeed 100644
--- a/demos/gtk-demo/example_treeview_liststore.cc
+++ b/demos/gtk-demo/example_treeview_liststore.cc
@@ -99,7 +99,7 @@ Gtk::Window* do_treeview_liststore()
Example_TreeView_ListStore::Example_TreeView_ListStore()
-: m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
+: m_VBox(Gtk::Orientation::VERTICAL, 8),
m_Label("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC
interface to bugzilla or so, though).")
{
set_title("Gtk::ListStore demo");
@@ -109,8 +109,8 @@ Example_TreeView_ListStore::Example_TreeView_ListStore()
add(m_VBox);
m_VBox.pack_start(m_Label, Gtk::PACK_SHRINK);
- m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_ETCHED_IN);
- m_ScrolledWindow.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
/* create model */
@@ -175,7 +175,7 @@ void Example_TreeView_ListStore::add_columns()
auto pColumn = m_TreeView.get_column(cols_count-1);
/* set this column to a fixed sizing (of 50 pixels) */
- pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
diff --git a/demos/gtk-demo/example_treeview_treestore.cc b/demos/gtk-demo/example_treeview_treestore.cc
index a932638..59fbc40 100644
--- a/demos/gtk-demo/example_treeview_treestore.cc
+++ b/demos/gtk-demo/example_treeview_treestore.cc
@@ -145,7 +145,7 @@ Gtk::Window* do_treeview_treestore()
Example_TreeView_TreeStore::Example_TreeView_TreeStore()
-: m_VBox(Gtk::ORIENTATION_VERTICAL, 8),
+: m_VBox(Gtk::Orientation::VERTICAL, 8),
m_Label("Jonathan's Holiday Card Planning Sheet")
{
set_title("Card planning sheet");
@@ -155,8 +155,8 @@ Example_TreeView_TreeStore::Example_TreeView_TreeStore()
add(m_VBox);
m_VBox.pack_start(m_Label, Gtk::PACK_SHRINK);
- m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_ETCHED_IN);
- m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindow.set_shadow_type(Gtk::ShadowType::ETCHED_IN);
+ m_ScrolledWindow.set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
m_VBox.pack_start(m_ScrolledWindow);
/* create model */
@@ -165,7 +165,7 @@ Example_TreeView_TreeStore::Example_TreeView_TreeStore()
/* create tree view */
m_TreeView.set_model(m_refTreeStore);
auto refTreeSelection = m_TreeView.get_selection();
- refTreeSelection->set_mode(Gtk::SELECTION_MULTIPLE);
+ refTreeSelection->set_mode(Gtk::SelectionMode::MULTIPLE);
add_columns();
@@ -341,7 +341,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
pColumn->add_attribute(pRenderer->property_activatable(), m_columns.world);
- pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
@@ -358,7 +358,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
- pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
@@ -376,7 +376,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
pColumn->add_attribute(pRenderer->property_activatable(), m_columns.world);
- pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
@@ -393,7 +393,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
- pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
@@ -410,7 +410,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
- pColumn->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
diff --git a/demos/gtk-demo/textwidget.cc b/demos/gtk-demo/textwidget.cc
index 03ee505..fccfdd0 100644
--- a/demos/gtk-demo/textwidget.cc
+++ b/demos/gtk-demo/textwidget.cc
@@ -28,8 +28,8 @@ using std::strlen;
TextWidget::TextWidget(bool is_source)
{
- set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- set_shadow_type (Gtk::SHADOW_IN);
+ set_policy(Gtk::PolicyType::AUTOMATIC, Gtk::PolicyType::AUTOMATIC);
+ set_shadow_type (Gtk::ShadowType::IN);
m_refTextBuffer = Gtk::TextBuffer::create();
m_TextView.set_buffer(m_refTextBuffer);
@@ -39,7 +39,7 @@ TextWidget::TextWidget(bool is_source)
if (is_source)
{
- m_TextView.set_wrap_mode (Gtk::WRAP_NONE);
+ m_TextView.set_wrap_mode (Gtk::WrapMode::NONE);
auto refTag = m_refTextBuffer->create_tag("source");
refTag->property_font() = "Courier 12";
@@ -53,24 +53,24 @@ TextWidget::TextWidget(bool is_source)
refTag = m_refTextBuffer->create_tag("string");
refTag->property_foreground() = "RosyBrown";
- refTag->property_weight() = Pango::WEIGHT_BOLD;
+ refTag->property_weight() = static_cast<int>(Pango::Weight::BOLD);
refTag = m_refTextBuffer->create_tag("control");
refTag->property_foreground() = "purple";
refTag = m_refTextBuffer->create_tag("preprocessor");
- refTag->property_style() = Pango::STYLE_OBLIQUE;
+ refTag->property_style() = Pango::Style::OBLIQUE;
refTag->property_foreground() = "burlywood4";
refTag = m_refTextBuffer->create_tag("function");
- refTag->property_weight() = Pango::WEIGHT_BOLD;
+ refTag->property_weight() = static_cast<int>(Pango::Weight::BOLD);
refTag->property_foreground() = "DarkGoldenrod4";
}
else
{
// Make it a bit nicer for text.
- m_TextView.set_wrap_mode (Gtk::WRAP_WORD);
+ m_TextView.set_wrap_mode (Gtk::WrapMode::WORD);
m_TextView.set_pixels_above_lines(2);
m_TextView.set_pixels_below_lines(2);
diff --git a/tests/child_widget2/main.cc b/tests/child_widget2/main.cc
index 4cd0f1b..5a45834 100644
--- a/tests/child_widget2/main.cc
+++ b/tests/child_widget2/main.cc
@@ -11,7 +11,7 @@ private:
MyWindow::MyWindow() :
b("hello"),
- vbox(Gtk::ORIENTATION_VERTICAL)
+ vbox(Gtk::Orientation::VERTICAL)
{
add(vbox);
vbox.pack_start(b);
diff --git a/tests/delete_cpp_child/main.cc b/tests/delete_cpp_child/main.cc
index fae91f9..2b0a4c9 100644
--- a/tests/delete_cpp_child/main.cc
+++ b/tests/delete_cpp_child/main.cc
@@ -19,7 +19,7 @@ private:
AppWindow::AppWindow()
: m_label (nullptr)
{
- Gtk::Box* vbox = Gtk::manage(new Gtk::Box (Gtk::ORIENTATION_VERTICAL, 5));
+ Gtk::Box* vbox = Gtk::manage(new Gtk::Box (Gtk::Orientation::VERTICAL, 5));
add(*vbox);
Gtk::Button* button = Gtk::manage(new Gtk::Button("Delete Label"));
diff --git a/tests/dialog/main.cc b/tests/dialog/main.cc
index 20b09d3..caa6598 100644
--- a/tests/dialog/main.cc
+++ b/tests/dialog/main.cc
@@ -19,7 +19,7 @@ private:
AppWindow::AppWindow()
: m_label (nullptr)
{
- Gtk::Box* vbox = manage (new Gtk::Box (Gtk::ORIENTATION_VERTICAL, 5));
+ Gtk::Box* vbox = manage (new Gtk::Box (Gtk::Orientation::VERTICAL, 5));
add(*vbox);
Gtk::Button* button = Gtk::manage (new Gtk::Button ("Delete Label"));
diff --git a/tests/dialog_deletethis/main.cc b/tests/dialog_deletethis/main.cc
index 30fbe14..c7109d5 100644
--- a/tests/dialog_deletethis/main.cc
+++ b/tests/dialog_deletethis/main.cc
@@ -13,8 +13,9 @@ class Dlg : public sigc::trackable
Gtk::Button *btn = manage(new Gtk::Button("ClickMe"));
btn->signal_clicked().connect(sigc::mem_fun(*this, &Dlg::on_button_clicked));
dlg_->get_content_area()->pack_start(*btn);
- dlg_->add_button("_OK", Gtk::RESPONSE_OK);
+ dlg_->add_button("_OK", Gtk::ResponseType::OK);
dlg_->signal_response().connect(sigc::mem_fun(*this, &Dlg::on_response));
+ dlg_->show();
}
~Dlg()
@@ -29,7 +30,7 @@ class Dlg : public sigc::trackable
void on_response(int id)
{
- if (id == Gtk::RESPONSE_OK || id == Gtk::RESPONSE_DELETE_EVENT)
+ if (id == Gtk::ResponseType::OK || id == Gtk::ResponseType::DELETE_EVENT)
quit();
}
diff --git a/tests/refcount_dialog/main.cc b/tests/refcount_dialog/main.cc
index adc1ce9..b9b00cf 100644
--- a/tests/refcount_dialog/main.cc
+++ b/tests/refcount_dialog/main.cc
@@ -25,7 +25,7 @@ protected:
};
MyWindow::MyWindow()
-: m_Box(Gtk::ORIENTATION_HORIZONTAL),
+: m_Box(Gtk::Orientation::HORIZONTAL),
m_Button("Show Dialog")
{
set_size_request(200, 200);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
