[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1692
Date       : Thu Aug 10 20:31:27 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/dlgmgr.cpp
   M /Trunk/XaraLX/wxXtra/treebook.cpp

Fix bz1421 (Options Window tab controls scrolled) in a slightly bodgy way. wxTreeeControl is not sizing sensibly


Diff:
Index: Trunk/XaraLX/wxXtra/treebook.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/treebook.cpp	(revision 1691)
+++ Trunk/XaraLX/wxXtra/treebook.cpp	(revision 1692)
@@ -38,7 +38,7 @@
                long style = wxTR_DEFAULT_STYLE,
                const wxValidator &validator = wxDefaultValidator,
                const wxString& name = wxTreeCtrlNameStr) :
-				wxTreeCtrl(parent, id, pos, size, style, validator, name), m_fixedBestSize(160,80) {}
+				wxTreeCtrl(parent, id, pos, size, style, validator, name), m_fixedBestSize(160,380) {}
 
 	virtual wxSize DoGetBestSize() const
 	{
@@ -130,7 +130,7 @@
                     this,
                     wxID_TREEBOOKTREEVIEW,
                     wxDefaultPosition,
-                    wxDefaultSize,
+                    wxSize(160,380),
                     wxBORDER_SIMPLE |
                     wxTR_DEFAULT_STYLE |
                     wxTR_HIDE_ROOT |
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1691)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1692)
@@ -7670,6 +7670,11 @@
 	// Get the dialog sized to fit
 	RelayoutDialog(pTabDlgOp);
 
+	// Scroll to start and end after yeild
+	::wxYield();
+	pBook->SetSelection(pBook->GetPageCount()-1);
+	pBook->SetSelection(0);
+
 	// First check if the OpeningPage parameter is not equal to -1, in which case this
 	// specifies the active page to be opened.
 	// Has to be an index as otherwise we have not specified the pages yet and so cannot


Xara