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

Added Set/GetSelection to wxPrintDialogData (the value of the Selection radio button);

Browse Source 
corrected bug in cursor.cpp (used wxIconRefData).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-08-31 12:03:05 +00:00
parent 311227c3fe
commit 5360828db9
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/cmndata.cpp
View File

@@ -677,6 +677,7 @@ wxPrintDialogData::wxPrintDialogData()
m_printAllPages = FALSE;
m_printCollate = FALSE;
m_printToFile = FALSE;
m_printSelection = FALSE;
m_printEnableSelection = FALSE;
m_printEnablePageNumbers = TRUE;
m_printEnablePrintToFile = TRUE;
@@ -702,6 +703,7 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
m_printAllPages = FALSE;
m_printCollate = FALSE;
m_printToFile = FALSE;
m_printSelection = FALSE;
m_printEnableSelection = FALSE;
m_printEnablePageNumbers = TRUE;
m_printEnablePrintToFile = TRUE;
@@ -789,6 +791,8 @@ void wxPrintDialogData::ConvertToNative()
if ( m_printAllPages )
pd->Flags |= PD_ALLPAGES;
if ( m_printAllPages )
pd->Flags |= PD_SELECTION;
if ( m_printCollate )
pd->Flags |= PD_COLLATE;
if ( m_printToFile )
@@ -834,6 +838,7 @@ void wxPrintDialogData::ConvertFromNative()
m_printNoCopies = pd->nCopies ;
m_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);
m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);
m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);
m_printEnablePrintToFile = ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE);
@@ -881,6 +886,7 @@ void wxPrintDialogData::operator=(const wxPrintDialogData& data)
m_printAllPages = data.m_printAllPages;
m_printCollate = data.m_printCollate;
m_printToFile = data.m_printToFile;
m_printSelection = data.m_printSelection;
m_printEnableSelection = data.m_printEnableSelection;
m_printEnablePageNumbers = data.m_printEnablePageNumbers;
m_printEnableHelp = data.m_printEnableHelp;
@@ -1013,7 +1019,6 @@ void wxPageSetupDialogData::ConvertToNative()
pd->hDevMode = NULL;
}
pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
m_printData.SetNativeData((void*) NULL);