Applied patch [ 619386 ] uxtheme.dll support

[wxWidgets.git] / src / common / prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 492581ef08ed1ea304c605805b372771ead75488..fc2df6a7057e1c968aaf934fbecb31d4588668e2 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -191,7 +191,7 @@ wxScrolledWindow(parent, -1, pos, size, style, name)
 #ifdef __WXMAC__
     // The app workspace colour is always white, but we should have
     // a contrast with the page.
-    wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE;
+    wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
 #else
     wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
 #endif    
@@ -228,7 +228,7 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
 #ifdef __WXMAC__
     // The app workspace colour is always white, but we should have
     // a contrast with the page.
-    wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE;
+    wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
 #else
     wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
 #endif    
@@ -503,7 +503,7 @@ BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
     EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
-wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title,
+wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxWindow *parent, const wxString& title,
                                const wxPoint& pos, const wxSize& size, long style, const wxString& name):
 wxFrame(parent, -1, title, pos, size, style, name)
 {
@@ -511,7 +511,7 @@ wxFrame(parent, -1, title, pos, size, style, name)
     m_controlBar = NULL;
     m_previewCanvas = NULL;
 
-    // Looks silly on Windows with a standard Windows icon    
+    // Give the application icon
 #ifdef __WXMSW__
     wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
     if (topFrame)