Clear --> ClearBackground
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d139c3a84b
commit
e71fd398b8
@ -195,7 +195,7 @@ wxScrolledWindow(parent, -1, pos, size, style, name)
|
||||
wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
|
||||
#else
|
||||
wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
|
||||
#endif
|
||||
#endif
|
||||
SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
|
||||
|
||||
SetScrollbars(10, 10, 100, 100);
|
||||
@ -232,7 +232,7 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
|
||||
wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
|
||||
#else
|
||||
wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
|
||||
#endif
|
||||
#endif
|
||||
SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
|
||||
Refresh();
|
||||
|
||||
@ -247,7 +247,7 @@ void wxPreviewCanvas::OnChar(wxKeyEvent &event)
|
||||
{
|
||||
((wxPreviewFrame*) GetParent())->Close(TRUE);
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (event.GetKeyCode() == WXK_TAB)
|
||||
{
|
||||
controlBar->OnGoto();
|
||||
@ -264,7 +264,7 @@ void wxPreviewCanvas::OnChar(wxKeyEvent &event)
|
||||
event.Skip();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
switch(event.GetKeyCode())
|
||||
{
|
||||
case WXK_NEXT:
|
||||
@ -433,58 +433,58 @@ void wxPreviewControlBar::CreateButtons()
|
||||
SetSize(0, 0, 400, 40);
|
||||
|
||||
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[] =
|
||||
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());
|
||||
@ -537,7 +537,7 @@ wxFrame(parent, -1, title, pos, size, style, name)
|
||||
wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
|
||||
if (topFrame)
|
||||
SetIcon(topFrame->GetIcon());
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
wxPreviewFrame::~wxPreviewFrame()
|
||||
@ -550,7 +550,7 @@ void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
|
||||
// are multiple top-level windows.
|
||||
#ifndef __WXMAC__
|
||||
MakeModal(FALSE);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Need to delete the printout and the print preview
|
||||
wxPrintout *printout = m_printPreview->GetPrintout();
|
||||
@ -592,7 +592,7 @@ void wxPreviewFrame::Initialize()
|
||||
#endif
|
||||
|
||||
Layout();
|
||||
|
||||
|
||||
m_printPreview->AdjustScrollbars(m_previewCanvas);
|
||||
m_previewCanvas->SetFocus();
|
||||
m_controlBar->SetFocus();
|
||||
@ -682,11 +682,11 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
|
||||
delete m_previewBitmap;
|
||||
m_previewBitmap = NULL;
|
||||
}
|
||||
|
||||
|
||||
if (m_previewCanvas)
|
||||
{
|
||||
AdjustScrollbars(m_previewCanvas);
|
||||
|
||||
|
||||
if (!RenderPage(pageNum))
|
||||
return FALSE;
|
||||
m_previewCanvas->Refresh();
|
||||
@ -751,7 +751,7 @@ void wxPrintPreviewBase::AdjustScrollbars(wxPreviewCanvas *canvas)
|
||||
int scrollUnitsY = totalHeight/10;
|
||||
wxSize virtualSize = canvas->GetVirtualSize();
|
||||
if (virtualSize.GetWidth() != totalWidth || virtualSize.GetHeight() != totalHeight)
|
||||
canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, TRUE);
|
||||
canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, TRUE);
|
||||
}
|
||||
|
||||
bool wxPrintPreviewBase::RenderPage(int pageNum)
|
||||
@ -902,7 +902,7 @@ void wxPrintPreviewBase::SetZoom(int percent)
|
||||
AdjustScrollbars(m_previewCanvas);
|
||||
RenderPage(m_currentPage);
|
||||
((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
|
||||
m_previewCanvas->Clear();
|
||||
m_previewCanvas->ClearBackground();
|
||||
m_previewCanvas->Refresh();
|
||||
m_previewCanvas->SetFocus();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user