X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fgtkmm2ext%2Ftabbable.cc;h=5e4752454e6cfd6c8547b56799f59399b2307165;hb=1468e270defc24de767e86118d0210480fad27b9;hp=be898a55553b4daff6b0e148f129379bfb351b48;hpb=a29fd4542e885cc8dff2e10ef5fc15912c6d4277;p=ardour.git

diff --git a/libs/gtkmm2ext/tabbable.cc b/libs/gtkmm2ext/tabbable.cc
index be898a5555..5e4752454e 100644
--- a/libs/gtkmm2ext/tabbable.cc
+++ b/libs/gtkmm2ext/tabbable.cc
@@ -29,7 +29,7 @@
 
 #include "pbd/stacktrace.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace Gtk;
@@ -140,7 +140,6 @@ Tabbable::show_own_window (bool and_pack_it)
 
 	tab_requested_by_state = false;
 
-	_window->show_all ();
 	_window->present ();
 }
 
@@ -197,6 +196,7 @@ void
 Tabbable::make_visible ()
 {
 	if (_window && (current_toplevel() == _window)) {
+		set_pos ();
 		_window->present ();
 	} else {
 
@@ -304,6 +304,7 @@ Tabbable::show_tab ()
 			add_to_notebook (*_parent_notebook, _tab_title);
 		}
 		_parent_notebook->set_current_page (_parent_notebook->page_num (_contents));
+		current_toplevel()->present ();
 	}
 }
 
@@ -352,7 +353,7 @@ Tabbable::set_state (const XMLNode& node, int version)
 	XMLNode* window_node = node.child ("Window");
 
 	if (window_node) {
-		const XMLProperty* prop = window_node->property (X_("tabbed"));
+		XMLProperty const * prop = window_node->property (X_("tabbed"));
 		if (prop) {
 			tab_requested_by_state = PBD::string_is_affirmative (prop->value());
 		}