fix GTK+ warnings when trying to determine maximum screen size without a Gdk::Window
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 19 Sep 2017 22:38:40 +0000 (18:38 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 19 Sep 2017 22:38:55 +0000 (18:38 -0400)
gtk2_ardour/generic_pluginui.cc

index 0e9935b29189b0d575f51bceb6ac4e735a177bb4..979cd4405a3ca54a4702679c523bec55d1d1c167 100644 (file)
@@ -224,12 +224,16 @@ GenericPluginUI::~GenericPluginUI ()
 void
 GenericPluginUI::scroller_size_request (Gtk::Requisition* a)
 {
-       Glib::RefPtr<Gdk::Screen> screen = get_screen();
-       if (!screen)
-               screen = Gdk::Screen::get_default();
+       Glib::RefPtr<Gdk::Window> window (get_window());
+       Glib::RefPtr<Gdk::Screen> screen;
 
-       int maximum_width;
-       {
+       if (window) {
+               screen = get_screen();
+       }
+
+       int maximum_width = -1;
+
+       if (screen) {
                Gdk::Rectangle monitor;
                const int monitor_num = screen->get_monitor_at_window (get_window ());
                screen->get_monitor_geometry (