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

Merge wxQT branch into the trunk.

Browse Source 
This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-08-24 01:50:11 +00:00
parent d513d3e2f0
commit df13791078
381 changed files with 24333 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/prntbase.cpp
View File

@@ -58,6 +58,9 @@
#include "wx/osx/printdlg.h"
#include "wx/osx/private/print.h"
#include "wx/osx/dcprint.h"
#elif defined(__WXQT__)
#include "wx/qt/dcprint.h"
#include "wx/qt/printdlg.h"
#else
#include "wx/generic/prntdlgg.h"
#include "wx/dcps.h"
@@ -101,6 +104,8 @@ wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
return new wxWindowsPrinter( data );
#elif defined(__WXMAC__)
return new wxMacPrinter( data );
#elif defined(__WXQT__)
return new wxQtPrinter( data );
#else
return new wxPostScriptPrinter( data );
#endif
@@ -113,6 +118,8 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe
return new wxWindowsPrintPreview( preview, printout, data );
#elif defined(__WXMAC__)
return new wxMacPrintPreview( preview, printout, data );
#elif defined(__WXQT__)
return new wxQtPrintPreview( preview, printout, data );
#else
return new wxPostScriptPrintPreview( preview, printout, data );
#endif
@@ -125,6 +132,8 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe
return new wxWindowsPrintPreview( preview, printout, data );
#elif defined(__WXMAC__)
return new wxMacPrintPreview( preview, printout, data );
#elif defined(__WXQT__)
return new wxQtPrintPreview( preview, printout, data );
#else
return new wxPostScriptPrintPreview( preview, printout, data );
#endif
@@ -137,6 +146,8 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
return new wxWindowsPrintDialog( parent, data );
#elif defined(__WXMAC__)
return new wxMacPrintDialog( parent, data );
#elif defined(__WXQT__)
return new wxQtPrintDialog( parent, data );
#else
return new wxGenericPrintDialog( parent, data );
#endif
@@ -149,6 +160,8 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
return new wxWindowsPrintDialog( parent, data );
#elif defined(__WXMAC__)
return new wxMacPrintDialog( parent, data );
#elif defined(__WXQT__)
return new wxQtPrintDialog( parent, data );
#else
return new wxGenericPrintDialog( parent, data );
#endif
@@ -161,6 +174,8 @@ wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *pa
return new wxWindowsPageSetupDialog( parent, data );
#elif defined(__WXMAC__)
return new wxMacPageSetupDialog( parent, data );
#elif defined(__WXQT__)
return new wxQtPageSetupDialog( parent, data );
#else
return new wxGenericPageSetupDialog( parent, data );
#endif
@@ -193,6 +208,10 @@ wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
wxUnusedVar(parent);
wxUnusedVar(data);
return NULL;
#elif defined(__WXQT__)
wxUnusedVar(parent);
wxUnusedVar(data);
return NULL;
#else
// Only here do we need to provide the print setup
// dialog ourselves, the other platforms either have
@@ -254,6 +273,8 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
return new wxWindowsPrintNativeData;
#elif defined(__WXMAC__)
return wxOSXCreatePrintData();
#elif defined(__WXQT__)
return new wxQtPrintNativeData;
#else
return new wxPostScriptPrintNativeData;
#endif
@@ -537,11 +558,9 @@ void wxPrintAbortDialog::SetProgress(int currentPage, int totalPages,
text += wxString::Format(_(" (copy %d of %d)"), currentCopy, totalCopies);
m_progress->SetLabel(text);
}
void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{
wxCHECK_RET( wxPrinterBase::sm_abortWindow != NULL, "OnCancel called twice" );
wxPrinterBase::sm_abortIt = true;
wxPrinterBase::sm_abortWindow->Destroy();
wxPrinterBase::sm_abortWindow = NULL;