Fix for [ 748890 ] can't set wxUSE_CONSTRAINTS to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -397,6 +397,7 @@ void wxPreviewControlBar::CreateButtons()
|
||||
{
|
||||
SetSize(0, 0, 400, 40);
|
||||
|
||||
#if wxUSE_CONSTRAINTS
|
||||
/*
|
||||
#ifdef __WXMSW__
|
||||
int fontSize = 9;
|
||||
@@ -499,7 +500,70 @@ void wxPreviewControlBar::CreateButtons()
|
||||
SetZoomControl(m_printPreview->GetZoom());
|
||||
}
|
||||
|
||||
// m_closeButton->SetDefault();
|
||||
#else
|
||||
|
||||
// Use sizers (backported from wxWindows CVS head).
|
||||
wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
int smallButtonWidth = 45;
|
||||
|
||||
m_closeButton = new wxButton( this, wxID_PREVIEW_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
item0->Add( m_closeButton, 0, wxALIGN_CENTRE|wxALL, 5 );
|
||||
|
||||
if (m_buttonFlags & wxPREVIEW_PRINT)
|
||||
{
|
||||
m_printButton = new wxButton( this, wxID_PREVIEW_PRINT, _("&Print..."), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
item0->Add( m_printButton, 0, wxALIGN_CENTRE|wxALL, 5 );
|
||||
}
|
||||
|
||||
if (m_buttonFlags & wxPREVIEW_FIRST)
|
||||
{
|
||||
m_firstPageButton = new wxButton( this, wxID_PREVIEW_FIRST, _("|<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
|
||||
item0->Add( m_firstPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
|
||||
}
|
||||
|
||||
if (m_buttonFlags & wxPREVIEW_PREVIOUS)
|
||||
{
|
||||
m_previousPageButton = new wxButton( this, wxID_PREVIEW_PREVIOUS, _("<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
|
||||
item0->Add( m_previousPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
|
||||
}
|
||||
|
||||
if (m_buttonFlags & wxPREVIEW_NEXT)
|
||||
{
|
||||
m_nextPageButton = new wxButton( this, wxID_PREVIEW_NEXT, _(">>"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
|
||||
item0->Add( m_nextPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
|
||||
}
|
||||
|
||||
if (m_buttonFlags & wxPREVIEW_LAST)
|
||||
{
|
||||
m_lastPageButton = new wxButton( this, wxID_PREVIEW_LAST, _(">>|"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
|
||||
item0->Add( m_lastPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
|
||||
}
|
||||
|
||||
if (m_buttonFlags & wxPREVIEW_GOTO)
|
||||
{
|
||||
m_gotoPageButton = new wxButton( this, wxID_PREVIEW_GOTO, _("&Goto..."), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
item0->Add( m_gotoPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
|
||||
}
|
||||
|
||||
if (m_buttonFlags & wxPREVIEW_ZOOM)
|
||||
{
|
||||
wxString choices[] =
|
||||
{
|
||||
wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"),
|
||||
wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"),
|
||||
wxT("120%"), wxT("150%"), wxT("200%")
|
||||
};
|
||||
int n = WXSIZEOF(choices);
|
||||
|
||||
m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,-1), n, choices, 0 );
|
||||
item0->Add( m_zoomControl, 0, wxALIGN_CENTRE|wxALL, 5 );
|
||||
SetZoomControl(m_printPreview->GetZoom());
|
||||
}
|
||||
|
||||
SetSizer(item0);
|
||||
item0->Fit(this);
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxPreviewControlBar::SetZoomControl(int zoom)
|
||||
|
Reference in New Issue
Block a user