diff options
| author | David Robillard <d@drobilla.net> | 2011-05-21 00:32:35 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-05-21 00:32:35 +0000 |
| commit | dc255319ff35012b892ed3ee2bb0d311ebe1a670 (patch) | |
| tree | b207cf938fc217c401f1e0aa27bfc368ad5f4f6c /src/gui/WindowFactory.cpp | |
| parent | 2c6db7e54c8124a7dd49d04fa949c3351676aee1 (diff) | |
| download | ingen-dc255319ff35012b892ed3ee2bb0d311ebe1a670.tar.gz ingen-dc255319ff35012b892ed3ee2bb0d311ebe1a670.tar.bz2 ingen-dc255319ff35012b892ed3ee2bb0d311ebe1a670.zip | |
Fix Gtk warnings (avoid loading top level of UI file).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3305 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/WindowFactory.cpp')
| -rw-r--r-- | src/gui/WindowFactory.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 99cf9d1d..15788243 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -47,17 +47,15 @@ WindowFactory::WindowFactory() , _new_subpatch_win(NULL) , _properties_win(NULL) { - Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create(); - - xml->get_widget_derived("load_plugin_win", _load_plugin_win); - xml->get_widget_derived("load_patch_win", _load_patch_win); - xml->get_widget_derived("load_remote_patch_win", _load_remote_patch_win); - xml->get_widget_derived("new_subpatch_win", _new_subpatch_win); - xml->get_widget_derived("properties_win", _properties_win); - xml->get_widget_derived("rename_win", _rename_win); + WidgetFactory::get_widget_derived("load_plugin_win", _load_plugin_win); + WidgetFactory::get_widget_derived("load_patch_win", _load_patch_win); + WidgetFactory::get_widget_derived("load_remote_patch_win", _load_remote_patch_win); + WidgetFactory::get_widget_derived("new_subpatch_win", _new_subpatch_win); + WidgetFactory::get_widget_derived("properties_win", _properties_win); + WidgetFactory::get_widget_derived("rename_win", _rename_win); #ifdef HAVE_CURL - xml->get_widget_derived("upload_patch_win", _upload_patch_win); + WidgetFactory::get_widget_derived("upload_patch_win", _upload_patch_win); #endif } @@ -169,10 +167,8 @@ WindowFactory::new_patch_window(SharedPtr<const PatchModel> patch, { assert( !view || view->patch() == patch); - Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create("patch_win"); - PatchWindow* win = NULL; - xml->get_widget_derived("patch_win", win); + WidgetFactory::get_widget_derived("patch_win", win); assert(win); win->set_patch(patch, view); |