Fix to reflect wxUNIVERSAL conditions from header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -77,7 +77,7 @@ void wxPrintFactory::SetPrintFactory( wxPrintFactory *factory )
|
||||
wxPrintFactory *wxPrintFactory::GetFactory()
|
||||
{
|
||||
if (!wxPrintFactory::m_factory)
|
||||
wxPrintFactory::m_factory = new wxNativePrintFactory;
|
||||
wxPrintFactory::m_factory = new wxNativePrintFactory;
|
||||
|
||||
return wxPrintFactory::m_factory;
|
||||
}
|
||||
@@ -88,7 +88,7 @@ wxPrintFactory *wxPrintFactory::GetFactory()
|
||||
|
||||
wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
|
||||
{
|
||||
#if defined(__WXMSW__)
|
||||
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
||||
return new wxWindowsPrinter( data );
|
||||
#elif defined(__WXMAC__)
|
||||
return new wxMacPrinter( data );
|
||||
@@ -100,7 +100,7 @@ wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
|
||||
wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
|
||||
wxPrintout *printout, wxPrintDialogData *data )
|
||||
{
|
||||
#if defined(__WXMSW__)
|
||||
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
||||
return new wxWindowsPrintPreview( preview, printout, data );
|
||||
#elif defined(__WXMAC__)
|
||||
return new wxMacPrintPreview( preview, printout, data );
|
||||
@@ -112,7 +112,7 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe
|
||||
wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
|
||||
wxPrintout *printout, wxPrintData *data )
|
||||
{
|
||||
#if defined(__WXMSW__)
|
||||
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
||||
return new wxWindowsPrintPreview( preview, printout, data );
|
||||
#elif defined(__WXMAC__)
|
||||
return new wxMacPrintPreview( preview, printout, data );
|
||||
|
Reference in New Issue
Block a user