Commit 33328cb7 authored by daniel_e's avatar daniel_e
Browse files

Get rid of the menubar_handle_ and toolbar_handle_ data members. We don't

need to keep them around anymore since the config option to hide one or the
other is gone.
parent 74a4dff6
2002-12-30 Daniel Elstner <daniel.elstner@gmx.net>
* src/mainwindow.{cc,h}: Get rid of the menubar_handle_ and
toolbar_handle_ data members. We don't need to keep them around
anymore since the config option to hide one or the other is gone.
2002-12-30 Daniel Elstner <daniel.elstner@gmx.net>
* src/aboutdialog.cc (SelectableLabel): New fancy experiment to
......
......@@ -138,8 +138,6 @@ public:
MainWindow::MainWindow()
:
menubar_handle_ (0),
toolbar_handle_ (0),
toolbar_ (0),
entry_folder_ (0),
entry_pattern_ (0),
......@@ -257,22 +255,17 @@ Gtk::Widget* MainWindow::create_main_vbox()
std::auto_ptr<Box> vbox_main (new VBox());
menubar_handle_ = new HandleBox();
vbox_main->pack_start(*manage(menubar_handle_), PACK_SHRINK);
HandleBox *const menubar_handle = new HandleBox();
vbox_main->pack_start(*manage(menubar_handle), PACK_SHRINK);
MenuBar *const menubar = controller_.create_menubar();
menubar_handle_->add(*manage(menubar));
menubar_handle->add(*manage(menubar));
// We have to call accelerate() manually, because otherwise the menu
// accelerators wouldn't be available if the menu bar is never shown
// due to user preference.
menubar->accelerate(*this);
toolbar_handle_ = new HandleBox();
vbox_main->pack_start(*manage(toolbar_handle_), PACK_SHRINK);
HandleBox *const toolbar_handle = new HandleBox();
vbox_main->pack_start(*manage(toolbar_handle), PACK_SHRINK);
toolbar_ = controller_.create_toolbar();
toolbar_handle_->add(*manage(toolbar_));
toolbar_handle->add(*manage(toolbar_));
Box *const vbox_interior = new VBox();
vbox_main->pack_start(*manage(vbox_interior), PACK_EXPAND_WIDGET);
......
......@@ -68,8 +68,6 @@ private:
Controller controller_;
Gtk::Tooltips tooltips_;
Gtk::HandleBox* menubar_handle_;
Gtk::HandleBox* toolbar_handle_;
Gtk::Toolbar* toolbar_;
Gtk::Entry* entry_folder_;
......
Supports Markdown
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