From 063fb2b587d1677b0b4b0d9e47e55801ec9f6c7a Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 3 May 2006 08:14:12 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=10091 --- checkin_notes | 9 ++++++++- clientgui/wizardex.cpp | 14 +++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index 886dd84368..e782aae4c7 100755 --- a/checkin_notes +++ b/checkin_notes @@ -4450,4 +4450,11 @@ Walt 2 May 2006 net_xfer_curl.C lib/ util.C - \ No newline at end of file + +Rom 3 May 2006 + - Bug Fix: To keep the Mac from clipping text in the wizard + increase the default width of a wizard page. The width + of each character is wider with the Mac fonts. + + clientgui/ + wizardex.cpp diff --git a/clientgui/wizardex.cpp b/clientgui/wizardex.cpp index c256e59031..a043e98276 100644 --- a/clientgui/wizardex.cpp +++ b/clientgui/wizardex.cpp @@ -555,9 +555,7 @@ bool wxWizardEx::ShowPage(wxWizardPageEx *page, bool goingForward) (void)m_page->GetEventHandler()->ProcessEvent(event); // wxWizardSizer::RecalcSizes wants to be called when m_page changes - GetSizer()->RecalcSizes(); - GetSizer()->SetSizeHints(this); - Fit(); + m_sizerPage->RecalcSizes(); // and finally show it m_page->Show(); @@ -610,6 +608,15 @@ void wxWizardEx::SetBorder(int border) wxSize wxWizardEx::GetManualPageSize() const { +#ifdef __WXMAC__ + // default width and height of the page + static const int DEFAULT_PAGE_WIDTH = 500; + //static const int DEFAULT_PAGE_HEIGHT = 290; + // For compatibility with 2.4: there's too much + // space under the bitmap, probably due to differences in + // the sizer implementation. This makes it reasonable again. + static const int DEFAULT_PAGE_HEIGHT = 270; +#else // default width and height of the page static const int DEFAULT_PAGE_WIDTH = 270; //static const int DEFAULT_PAGE_HEIGHT = 290; @@ -617,6 +624,7 @@ wxSize wxWizardEx::GetManualPageSize() const // space under the bitmap, probably due to differences in // the sizer implementation. This makes it reasonable again. static const int DEFAULT_PAGE_HEIGHT = 270; +#endif wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT);