diff options
| author | David Robillard <d@drobilla.net> | 2007-08-02 06:41:47 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-08-02 06:41:47 +0000 |
| commit | a8ea9db4af11208293543f50392127819c8007cd (patch) | |
| tree | f25576876216aa74a9a5194e870ba12d1b797ecf | |
| parent | 84b9118ee4dcc180b8fbae85910bec0590858680 (diff) | |
| download | ingen-a8ea9db4af11208293543f50392127819c8007cd.tar.gz ingen-a8ea9db4af11208293543f50392127819c8007cd.tar.bz2 ingen-a8ea9db4af11208293543f50392127819c8007cd.zip | |
Actually move canvas items on move_to (fix ticket 74).
git-svn-id: http://svn.drobilla.net/lad/ingen@669 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/libs/gui/App.hpp | 16 | ||||
| -rw-r--r-- | src/libs/gui/PatchWindow.cpp | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/gui/App.hpp b/src/libs/gui/App.hpp index fd90426b..ea549c09 100644 --- a/src/libs/gui/App.hpp +++ b/src/libs/gui/App.hpp @@ -85,13 +85,13 @@ public: void quit(); - ConnectWindow* connect_window() const { return _connect_window; } - Gtk::Dialog* about_dialog() const { return _about_dialog; } - ConfigWindow* configuration_dialog() const { return _config_window; } - MessagesWindow* messages_dialog() const { return _messages_window; } - PatchTreeWindow* patch_tree() const { return _patch_tree_window; } - Configuration* configuration() const { return _configuration; } - WindowFactory* window_factory() const { return _window_factory; } + ConnectWindow* connect_window() const { return _connect_window; } + Gtk::AboutDialog* about_dialog() const { return _about_dialog; } + ConfigWindow* configuration_dialog() const { return _config_window; } + MessagesWindow* messages_dialog() const { return _messages_window; } + PatchTreeWindow* patch_tree() const { return _patch_tree_window; } + Configuration* configuration() const { return _configuration; } + WindowFactory* window_factory() const { return _window_factory; } const SharedPtr<EngineInterface>& engine() const { return _engine; } const SharedPtr<SigClientInterface>& client() const { return _client; } @@ -123,7 +123,7 @@ protected: MessagesWindow* _messages_window; PatchTreeWindow* _patch_tree_window; ConfigWindow* _config_window; - Gtk::Dialog* _about_dialog; + Gtk::AboutDialog* _about_dialog; WindowFactory* _window_factory; Ingen::Shared::World* _world; diff --git a/src/libs/gui/PatchWindow.cpp b/src/libs/gui/PatchWindow.cpp index e92f0fd7..ceeff852 100644 --- a/src/libs/gui/PatchWindow.cpp +++ b/src/libs/gui/PatchWindow.cpp @@ -124,8 +124,8 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad _menu_view_patch_tree_window->signal_activate().connect( sigc::mem_fun<void>(App::instance().patch_tree(), &PatchTreeWindow::present)); - _menu_help_about->signal_activate().connect( - sigc::mem_fun<void>(App::instance().about_dialog(), &Gtk::Dialog::present)); + _menu_help_about->signal_activate().connect(sigc::hide_return( + sigc::mem_fun(App::instance().about_dialog(), &Gtk::AboutDialog::run))); _breadcrumb_box = new BreadCrumbBox(); _breadcrumb_box->signal_patch_selected.connect(sigc::mem_fun(this, &PatchWindow::set_patch_from_path)); |