mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-08-17 17:02:51 +08:00
Remove unused wxUSE_COMMON_DIALOGS option
This commit is contained in:
@@ -392,7 +392,6 @@ wx_option(wxUSE_TREELISTCTRL "use wxTreeListCtrl class")
|
||||
# common dialogs
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
wx_option(wxUSE_COMMON_DIALOGS "use all common dialogs")
|
||||
wx_option(wxUSE_ABOUTDLG "use wxAboutBox")
|
||||
wx_option(wxUSE_CHOICEDLG "use wxChoiceDialog")
|
||||
wx_option(wxUSE_COLOURDLG "use wxColourDialog")
|
||||
|
||||
@@ -445,8 +445,6 @@
|
||||
#endif
|
||||
|
||||
|
||||
#cmakedefine01 wxUSE_COMMON_DIALOGS
|
||||
|
||||
#cmakedefine01 wxUSE_BUSYINFO
|
||||
|
||||
#cmakedefine01 wxUSE_CHOICEDLG
|
||||
|
||||
@@ -308,7 +308,6 @@ library:
|
||||
@itemdef{wxUSE_ACCESSIBILITY, Enable accessibility support}
|
||||
@itemdef{wxUSE_ACTIVEX, Use wxActiveXContainer and related classes.}
|
||||
@itemdef{wxUSE_COMBOCTRL_POPUP_ANIMATION, See wx/msw/combo.h file.}
|
||||
@itemdef{wxUSE_COMMON_DIALOGS, Enable use of windows common dialogs from header commdlg.h; example PRINTDLG.}
|
||||
@itemdef{wxUSE_CRASHREPORT, Use wxCrashReport class.}
|
||||
@itemdef{wxUSE_DATEPICKCTRL_GENERIC, Use generic wxDatePickerCtrl implementation in addition to the native one.}
|
||||
@itemdef{wxUSE_DC_CACHEING, cache temporary wxDC objects.}
|
||||
|
||||
@@ -1184,14 +1184,6 @@
|
||||
// common dialogs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Use common dialogs (e.g. file selector, printer dialog). Switching this off
|
||||
// also switches off the printing architecture and interactive wxPrinterDC.
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_COMMON_DIALOGS 1
|
||||
|
||||
// wxBusyInfo displays window with message when app is busy. Works in same way
|
||||
// as wxBusyCursor
|
||||
#define wxUSE_BUSYINFO 1
|
||||
|
||||
@@ -1184,14 +1184,6 @@
|
||||
// common dialogs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Use common dialogs (e.g. file selector, printer dialog). Switching this off
|
||||
// also switches off the printing architecture and interactive wxPrinterDC.
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_COMMON_DIALOGS 1
|
||||
|
||||
// wxBusyInfo displays window with message when app is busy. Works in same way
|
||||
// as wxBusyCursor
|
||||
#define wxUSE_BUSYINFO 1
|
||||
|
||||
@@ -1184,14 +1184,6 @@
|
||||
// common dialogs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Use common dialogs (e.g. file selector, printer dialog). Switching this off
|
||||
// also switches off the printing architecture and interactive wxPrinterDC.
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_COMMON_DIALOGS 1
|
||||
|
||||
// wxBusyInfo displays window with message when app is busy. Works in same way
|
||||
// as wxBusyCursor
|
||||
#define wxUSE_BUSYINFO 1
|
||||
|
||||
@@ -1191,14 +1191,6 @@
|
||||
// common dialogs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Use common dialogs (e.g. file selector, printer dialog). Switching this off
|
||||
// also switches off the printing architecture and interactive wxPrinterDC.
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_COMMON_DIALOGS 1
|
||||
|
||||
// wxBusyInfo displays window with message when app is busy. Works in same way
|
||||
// as wxBusyCursor
|
||||
#define wxUSE_BUSYINFO 1
|
||||
|
||||
@@ -1180,14 +1180,6 @@
|
||||
// common dialogs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Use common dialogs (e.g. file selector, printer dialog). Switching this off
|
||||
// also switches off the printing architecture and interactive wxPrinterDC.
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_COMMON_DIALOGS 1
|
||||
|
||||
// wxBusyInfo displays window with message when app is busy. Works in same way
|
||||
// as wxBusyCursor
|
||||
#define wxUSE_BUSYINFO 1
|
||||
|
||||
@@ -1184,14 +1184,6 @@
|
||||
// common dialogs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Use common dialogs (e.g. file selector, printer dialog). Switching this off
|
||||
// also switches off the printing architecture and interactive wxPrinterDC.
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_COMMON_DIALOGS 1
|
||||
|
||||
// wxBusyInfo displays window with message when app is busy. Works in same way
|
||||
// as wxBusyCursor
|
||||
#define wxUSE_BUSYINFO 1
|
||||
|
||||
@@ -448,8 +448,6 @@
|
||||
#endif
|
||||
|
||||
|
||||
#define wxUSE_COMMON_DIALOGS 0
|
||||
|
||||
#define wxUSE_BUSYINFO 0
|
||||
|
||||
#define wxUSE_CHOICEDLG 0
|
||||
|
||||
@@ -501,8 +501,6 @@ typedef pid_t GPid;
|
||||
#define wxUSE_AUTOID_MANAGEMENT 0
|
||||
#endif
|
||||
|
||||
#define wxUSE_COMMON_DIALOGS 1
|
||||
|
||||
#define wxUSE_BUSYINFO 1
|
||||
|
||||
#define wxUSE_CHOICEDLG 1
|
||||
|
||||
@@ -74,69 +74,6 @@ wxIMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxMSWDCImpl);
|
||||
// wxPrinterDC construction
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if 0
|
||||
// This form is deprecated
|
||||
wxPrinterDC::wxPrinterDC(const wxString& driver_name,
|
||||
const wxString& device_name,
|
||||
const wxString& file,
|
||||
bool interactive,
|
||||
wxPrintOrientation orientation)
|
||||
{
|
||||
m_isInteractive = interactive;
|
||||
|
||||
if ( !file.empty() )
|
||||
m_printData.SetFilename(file);
|
||||
|
||||
#if wxUSE_COMMON_DIALOGS
|
||||
if ( interactive )
|
||||
{
|
||||
PRINTDLG pd;
|
||||
|
||||
pd.lStructSize = sizeof( PRINTDLG );
|
||||
pd.hwndOwner = (HWND) nullptr;
|
||||
pd.hDevMode = (HANDLE)nullptr;
|
||||
pd.hDevNames = (HANDLE)nullptr;
|
||||
pd.Flags = PD_RETURNDC | PD_NOSELECTION | PD_NOPAGENUMS;
|
||||
pd.nFromPage = 0;
|
||||
pd.nToPage = 0;
|
||||
pd.nMinPage = 0;
|
||||
pd.nMaxPage = 0;
|
||||
pd.nCopies = 1;
|
||||
pd.hInstance = (HINSTANCE)nullptr;
|
||||
|
||||
m_ok = PrintDlg( &pd ) != 0;
|
||||
if ( m_ok )
|
||||
{
|
||||
m_hDC = (WXHDC) pd.hDC;
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif // wxUSE_COMMON_DIALOGS
|
||||
{
|
||||
if ( !driver_name.empty() && !device_name.empty() && !file.empty() )
|
||||
{
|
||||
m_hDC = (WXHDC) CreateDC(driver_name.t_str(),
|
||||
device_name.t_str(),
|
||||
file.fn_str(),
|
||||
nullptr);
|
||||
}
|
||||
else // we don't have all parameters, ask the user
|
||||
{
|
||||
wxPrintData printData;
|
||||
printData.SetOrientation(orientation);
|
||||
m_hDC = wxGetPrinterDC(printData);
|
||||
}
|
||||
|
||||
m_ok = m_hDC ? true: false;
|
||||
|
||||
// as we created it, we must delete it as well
|
||||
m_bOwnsDC = true;
|
||||
}
|
||||
|
||||
Init();
|
||||
}
|
||||
#endif
|
||||
|
||||
wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printData ) :
|
||||
wxMSWDCImpl( owner )
|
||||
, m_printData(printData)
|
||||
|
||||
Reference in New Issue
Block a user