Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Still use wxPreviewFrame size if it was explicitly specified

Browse Source 
Even though it's better to not specify the preview frame size at all,
the size should still be used if it was explicitly specified, but this
didn't happen any more after the addition of the call to Fit().

Fix this now by only doing the equivalent of Fit() if no size was
explicitly given.

Also add advice about not setting the size explicitly to the
documentation.
This commit is contained in:
Vadim Zeitlin
2022-05-21 17:13:49 +01:00
parent fc0a4d4e62
commit 663fa1c77b
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/prntbase.h
View File

@@ -444,6 +444,8 @@ protected:
private:
void OnChar(wxKeyEvent& event);
const wxSize m_initialSize;
wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxPreviewFrame);
wxDECLARE_NO_COPY_CLASS(wxPreviewFrame);

3
interface/wx/print.h
View File

@@ -195,6 +195,9 @@ public:
Pass a print preview object plus other normal frame arguments.
The print preview object will be destroyed by the frame when it closes.
Note that @a size typically should @e not be specified explicitly to
let the frame use its default size, adapted to its contents.
*/
wxPreviewFrame(wxPrintPreviewBase* preview, wxWindow* parent,
const wxString& title = "Print Preview",

13
src/common/prntbase.cpp
View File

@@ -1702,7 +1702,8 @@ void wxPreviewFrame::OnChar(wxKeyEvent &event)
wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxWindow *parent, const wxString& title,
const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxFrame(parent, wxID_ANY, title, pos, size, style, name)
wxFrame(parent, wxID_ANY, title, pos, size, style, name),
m_initialSize(size)
{
m_printPreview = preview;
m_controlBar = NULL;
@@ -1773,7 +1774,15 @@ void wxPreviewFrame::InitializeWithModality(wxPreviewFrameModalityKind kind)
sizer->Add( m_previewCanvas, wxSizerFlags(1).Expand() );
SetSizer( sizer );
sizer->Fit(this);
// Respect the user-specified size, if any, but use the best appropriate
// size by default if none was explicitly given.
if ( !m_initialSize.IsFullySpecified() )
{
wxSize size = m_initialSize;
size.SetDefaults(sizer->ComputeFittingWindowSize(this));
SetSize(size);
}
// We don't want to restrict shrinking the window vertically as it might be
// too tall (see SetInitialSize() call in wxPreviewCanvas ctor), but we do