[Scummvm-cvs-logs] SF.net SVN: scummvm: [28073] scummex/branches/gsoc2007-gameresbrowser/src/ browser/ExplorationTree.cpp

[zbychs at users.sourceforge.net]

Revision: 28073
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28073&view=rev
Author:   zbychs
Date:     2007-07-14 08:12:22 -0700 (Sat, 14 Jul 2007)

Log Message:
-----------
wxGTK specific bugfix in the ExplorationTree. Because of a bug in wxGTK it still logs a failed assert tough.

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/src/browser/ExplorationTree.cpp

Modified: scummex/branches/gsoc2007-gameresbrowser/src/browser/ExplorationTree.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browser/ExplorationTree.cpp	2007-07-14 15:09:30 UTC (rev 28072)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browser/ExplorationTree.cpp	2007-07-14 15:12:22 UTC (rev 28073)
@@ -548,8 +548,8 @@
 	frame->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW,
 		wxCloseEventHandler(PanelInfo::OnClose), NULL, this);
 
+	_panelNotebook->RemovePage(_pageIdx);
 	_page->Reparent(frame);
-	_panelNotebook->RemovePage(_pageIdx);
 	removeIdx();
 	_detached = true;
 
@@ -570,10 +570,12 @@
 void PanelInfo::attach() {
 	if (!_activated || !_detached)
 		return;
+
 	wxWindow* frame = _page->GetParent();
 	_page->Reparent(_panelNotebook);
 	_panelNotebook->AddPage(_page, _panelProvider->getPanelTitle());
 	_pageIdx = _panelNotebook->GetPageCount() - 1;
+
 	frame->Destroy();
 	_detached = false;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.