Commit 107c71d6 authored by Fabien Parent's avatar Fabien Parent
Browse files

Replace usage of deprecated APIs

parent f167858a
......@@ -180,7 +180,7 @@ public:
MainWindow::MainWindow()
:
toolbar_ (0),
table_file_ (0),
grid_file_ (0),
button_folder_ (0),
combo_entry_pattern_ (Gtk::manage(new Gtk::ComboBoxText(true))),
button_recursive_ (0),
......@@ -214,7 +214,7 @@ MainWindow::MainWindow()
vbox_main_->pack_start(*statusline_, Gtk::PACK_SHRINK);
scrollwin_filetree_->add(*filetree_);
table_file_->attach(*combo_entry_pattern_, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::FILL);
grid_file_->attach(*combo_entry_pattern_, 1, 1, 1, 1);
scrollwin_textview_->add(*textview_);
......@@ -341,7 +341,7 @@ void MainWindow::load_xml()
xml->get_widget("entry_preview", entry_preview_);
xml->get_widget("vbox_main", vbox_main_);
xml->get_widget("scrollwin_filetree", scrollwin_filetree_);
xml->get_widget("table_file", table_file_);
xml->get_widget("grid_file", grid_file_);
controller_.load_xml(xml);
}
......
......@@ -44,9 +44,9 @@ class Toolbar;
class Window;
class ComboBox;
class ComboBoxText;
class VBox;
class Box;
class ScrolledWindow;
class Table;
class Grid;
class EntryCompletion;
}
......@@ -95,11 +95,11 @@ private:
std::auto_ptr<Gtk::Window> window_;
Controller controller_;
Gtk::VBox* vbox_main_;
Gtk::Box* vbox_main_;
Gtk::Toolbar* toolbar_;
Gtk::Table* table_file_;
Gtk::Grid* grid_file_;
Gtk::FileChooser* button_folder_;
Gtk::ComboBoxText* combo_entry_pattern_;
......
......@@ -70,10 +70,10 @@ CounterBox::CounterBox(const Glib::ustring& label)
set_shadow_type(SHADOW_ETCHED_IN);
Box *const paddingbox = new HBox(false, 0);
Box *const paddingbox = new Box();
add(*manage(paddingbox));
Box *const box = new HBox(false, 0);
Box *const box = new Box();
paddingbox->pack_start(*manage(box), PACK_SHRINK, 2);
box->pack_start(*manage(new Label(label + ' ')), PACK_SHRINK);
......@@ -221,7 +221,7 @@ void CounterBox::on_label_style_updated()
StatusLine::StatusLine()
:
Gtk::HBox(false, 3),
Gtk::Box (Gtk::ORIENTATION_HORIZONTAL, 3),
stop_button_ (0),
progressbar_ (0),
file_counter_ (0),
......@@ -331,7 +331,7 @@ void StatusLine::on_hierarchy_changed(Gtk::Widget* previous_toplevel)
window->get_accel_group(), GDK_KEY_Escape, Gdk::ModifierType(0));
}
Gtk::HBox::on_hierarchy_changed(previous_toplevel);
Gtk::Box::on_hierarchy_changed(previous_toplevel);
if (Gtk::Window *const window = dynamic_cast<Gtk::Window*>(get_toplevel()))
{
......
......@@ -37,7 +37,7 @@ namespace Regexxer
class CounterBox;
class StatusLine : public Gtk::HBox
class StatusLine : public Gtk::Box
{
public:
StatusLine();
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment