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

Have dark colour for preview canvas under Mac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-17 20:04:33 +00:00
parent feea0f9569
commit 46b24ef914
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/prntbase.cpp
View File

@@ -188,7 +188,14 @@ wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
wxScrolledWindow(parent, -1, pos, size, style, name) wxScrolledWindow(parent, -1, pos, size, style, name)
{ {
m_printPreview = preview; m_printPreview = preview;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); #ifdef __WXMAC__
// The app workspace colour is always white, but we should have
// a contrast with the page.
wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE;
#else
wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
#endif
SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
SetScrollbars(15, 18, 100, 100); SetScrollbars(15, 18, 100, 100);
} }
@@ -218,7 +225,14 @@ void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
// Responds to colour changes, and passes event on to children. // Responds to colour changes, and passes event on to children.
void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event) void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
{ {
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); #ifdef __WXMAC__
// The app workspace colour is always white, but we should have
// a contrast with the page.
wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE;
#else
wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
#endif
SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
Refresh(); Refresh();
// Propagate the event to the non-top-level children // Propagate the event to the non-top-level children
@@ -496,6 +510,13 @@ wxFrame(parent, -1, title, pos, size, style, name)
m_printPreview = preview; m_printPreview = preview;
m_controlBar = NULL; m_controlBar = NULL;
m_previewCanvas = NULL; m_previewCanvas = NULL;
// Looks silly on Windows with a standard Windows icon
#ifdef __WXMSW__
wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
if (topFrame)
SetIcon(topFrame->GetIcon());
#endif
} }
wxPreviewFrame::~wxPreviewFrame() wxPreviewFrame::~wxPreviewFrame()