X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2997ca30d66c2dc778ed9a84c8c94fea6ec1c958..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/prntbase.cpp diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 1f1f0487f7..b3f2e48a3d 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -54,14 +54,13 @@ #include "wx/msw/printdlg.h" #elif defined(__WXMAC__) #include "wx/mac/printdlg.h" +#include "wx/mac/private/print.h" #else #include "wx/generic/prntdlgg.h" #endif #ifdef __WXMSW__ - #include "wx/msw/private.h" - #include - + #include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif @@ -248,7 +247,7 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData() #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) return new wxWindowsPrintNativeData; #elif defined(__WXMAC__) - return new wxMacPrintNativeData; + return new wxMacCarbonPrintData; #else return new wxPostScriptPrintNativeData; #endif @@ -1006,7 +1005,7 @@ void wxPreviewFrame::CreateControlBar() if (m_printPreview->GetPrintoutForPrinting()) buttons |= wxPREVIEW_PRINT; - m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(), wxSize(400, 40)); + m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0,0), wxSize(400, 40)); m_controlBar->CreateButtons(); }