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

Renamed wxPrintNativeData methods to better match

Browse Source 
those of the preexisting wxMac class. This should
    make transition of the wxMac classes to the new
    wxPrintNativeData classes easier.
  Renamed wxWindowsPrintNativeData to a proper name
    that is less confusing (GetNativeData -> GetDevMode).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-10-17 23:00:41 +00:00
parent 3692b33c7f
commit fd64de596c
8 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/prntdlgg.h
View File

@@ -85,8 +85,8 @@ public:
wxPostScriptPrintNativeData(); wxPostScriptPrintNativeData();
virtual ~wxPostScriptPrintNativeData(); virtual ~wxPostScriptPrintNativeData();
virtual bool ConvertTo( wxPrintData &data ); virtual bool TransferTo( wxPrintData &data );
virtual bool ConvertFrom( const wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data );
virtual bool Ok() const { return true; } virtual bool Ok() const { return true; }

4
include/wx/mac/carbon/printdlg.h
View File

@@ -33,8 +33,8 @@ public:
wxMacPrintNativeData() {}; wxMacPrintNativeData() {};
virtual ~wxMacPrintNativeData() {}; virtual ~wxMacPrintNativeData() {};
virtual bool ConvertTo( wxPrintData &data ) { return true; } virtual bool TransferTo( wxPrintData &data ) { return true; }
virtual bool ConvertFrom( const wxPrintData &data ) { return true; } virtual bool TransferFrom( const wxPrintData &data ) { return true; }
virtual bool Ok() const { return true; } virtual bool Ok() const { return true; }
}; };

16
include/wx/msw/printdlg.h
View File

@@ -35,19 +35,19 @@ public:
wxWindowsPrintNativeData(); wxWindowsPrintNativeData();
virtual ~wxWindowsPrintNativeData(); virtual ~wxWindowsPrintNativeData();
virtual bool ConvertTo( wxPrintData &data ); virtual bool TransferTo( wxPrintData &data );
virtual bool ConvertFrom( const wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data );
virtual bool Ok() const; virtual bool Ok() const;
void* GetNativeData() const { return m_devMode; } void* GetDevMode() const { return m_devMode; }
void SetNativeData(void* data) { m_devMode = data; } void SetDevMode(void* data) { m_devMode = data; }
void* GetNativeDataDevNames() const { return m_devNames; } void* GetDevNames() const { return m_devNames; }
void SetNativeDataDevNames(void* data) { m_devNames = data; } void SetDevNames(void* data) { m_devNames = data; }
private: private:
void* m_devMode; void* m_devMode;
void* m_devNames; void* m_devNames;
private: private:
DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData) DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)

4
include/wx/prntbase.h
View File

@@ -121,8 +121,8 @@ public:
wxPrintNativeDataBase(); wxPrintNativeDataBase();
virtual ~wxPrintNativeDataBase() {} virtual ~wxPrintNativeDataBase() {}
virtual bool ConvertTo( wxPrintData &data ) = 0; virtual bool TransferTo( wxPrintData &data ) = 0;
virtual bool ConvertFrom( const wxPrintData &data ) = 0; virtual bool TransferFrom( const wxPrintData &data ) = 0;
virtual bool Ok() const = 0; virtual bool Ok() const = 0;

52
src/common/cmndata.cpp
View File

@@ -240,7 +240,7 @@ void wxPrintData::operator=(const wxPrintData& data)
// Is this data OK for showing the print dialog? // Is this data OK for showing the print dialog?
bool wxPrintData::Ok() const bool wxPrintData::Ok() const
{ {
m_nativeData->ConvertFrom( *this ); m_nativeData->TransferFrom( *this );
return m_nativeData->Ok(); return m_nativeData->Ok();
} }
@@ -318,7 +318,7 @@ void wxPrintDialogData::ConvertToNative()
{ {
wxWindowsPrintNativeData *data = wxWindowsPrintNativeData *data =
(wxWindowsPrintNativeData *) m_printData.GetNativeData(); (wxWindowsPrintNativeData *) m_printData.GetNativeData();
data->ConvertFrom( m_printData ); data->TransferFrom( m_printData );
PRINTDLG *pd = (PRINTDLG*) m_printDlgData; PRINTDLG *pd = (PRINTDLG*) m_printDlgData;
@@ -356,16 +356,16 @@ void wxPrintDialogData::ConvertToNative()
GlobalFree(pd->hDevNames); GlobalFree(pd->hDevNames);
} }
pd->hDevMode = (HGLOBAL)(DWORD) data->GetNativeData(); pd->hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
data->SetNativeData((void*) NULL); data->SetDevMode( (void*) NULL);
// Shouldn't assert; we should be able to test Ok-ness at a higher level // Shouldn't assert; we should be able to test Ok-ness at a higher level
//wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!")); //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
pd->hDevNames = (HGLOBAL)(DWORD) data->GetNativeDataDevNames(); pd->hDevNames = (HGLOBAL)(DWORD) data->GetDevNames();
data->SetNativeDataDevNames((void*) NULL); data->SetDevNames( (void*) NULL);
pd->hDC = (HDC) NULL; pd->hDC = (HDC) NULL;
pd->nFromPage = (WORD)m_printFromPage; pd->nFromPage = (WORD)m_printFromPage;
@@ -427,30 +427,30 @@ void wxPrintDialogData::ConvertFromNative()
// Pass the devmode data back to the wxPrintData structure where it really belongs. // Pass the devmode data back to the wxPrintData structure where it really belongs.
if (pd->hDevMode) if (pd->hDevMode)
{ {
if (data->GetNativeData()) if (data->GetDevMode())
{ {
// Make sure we don't leak memory // Make sure we don't leak memory
GlobalFree( (HGLOBAL)(DWORD) data->GetNativeData() ); GlobalFree( (HGLOBAL)(DWORD) data->GetDevMode() );
} }
data->SetNativeData( (void*)(long) pd->hDevMode ); data->SetDevMode( (void*)(long) pd->hDevMode );
pd->hDevMode = NULL; pd->hDevMode = NULL;
} }
// Pass the devnames data back to the wxPrintData structure where it really belongs. // Pass the devnames data back to the wxPrintData structure where it really belongs.
if (pd->hDevNames) if (pd->hDevNames)
{ {
if (data->GetNativeDataDevNames()) if (data->GetDevNames())
{ {
// Make sure we don't leak memory // Make sure we don't leak memory
GlobalFree((HGLOBAL)(DWORD) data->GetNativeDataDevNames()); GlobalFree((HGLOBAL)(DWORD) data->GetDevNames());
} }
data->SetNativeDataDevNames((void*)(long) pd->hDevNames); data->SetDevNames((void*)(long) pd->hDevNames);
pd->hDevNames = NULL; pd->hDevNames = NULL;
} }
// Now convert the DEVMODE object, passed down from the PRINTDLG object, // Now convert the DEVMODE object, passed down from the PRINTDLG object,
// into wxWidgets form. // into wxWidgets form.
data->ConvertTo( m_printData ); data->TransferTo( m_printData );
m_printFromPage = pd->nFromPage; m_printFromPage = pd->nFromPage;
m_printToPage = pd->nToPage; m_printToPage = pd->nToPage;
@@ -648,7 +648,7 @@ void wxPageSetupDialogData::ConvertToNative()
{ {
wxWindowsPrintNativeData *data = wxWindowsPrintNativeData *data =
(wxWindowsPrintNativeData *) m_printData.GetNativeData(); (wxWindowsPrintNativeData *) m_printData.GetNativeData();
data->ConvertFrom( m_printData ); data->TransferFrom( m_printData );
PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData; PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;
@@ -670,9 +670,9 @@ void wxPageSetupDialogData::ConvertToNative()
pd->hDevMode = NULL; pd->hDevMode = NULL;
} }
pd->hDevMode = (HGLOBAL) data->GetNativeData(); pd->hDevMode = (HGLOBAL) data->GetDevMode();
data->SetNativeData((void*) NULL); data->SetDevMode( (void*) NULL );
// Shouldn't assert; we should be able to test Ok-ness at a higher level // Shouldn't assert; we should be able to test Ok-ness at a higher level
//wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!")); //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
@@ -687,9 +687,9 @@ void wxPageSetupDialogData::ConvertToNative()
pd->hDevNames = NULL; pd->hDevNames = NULL;
} }
pd->hDevNames = (HGLOBAL) data->GetNativeDataDevNames(); pd->hDevNames = (HGLOBAL) data->GetDevNames();
data->SetNativeDataDevNames((void*) NULL); data->SetDevNames((void*) NULL);
// pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE)); // pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
@@ -762,30 +762,30 @@ void wxPageSetupDialogData::ConvertFromNative()
// Pass the devmode data back to the wxPrintData structure where it really belongs. // Pass the devmode data back to the wxPrintData structure where it really belongs.
if (pd->hDevMode) if (pd->hDevMode)
{ {
if (data->GetNativeData()) if (data->GetDevMode())
{ {
// Make sure we don't leak memory // Make sure we don't leak memory
GlobalFree((HGLOBAL) data->GetNativeData()); GlobalFree((HGLOBAL) data->GetDevMode());
} }
data->SetNativeData((void*) pd->hDevMode); data->SetDevMode( (void*) pd->hDevMode );
pd->hDevMode = NULL; pd->hDevMode = NULL;
} }
data->ConvertTo( m_printData ); data->TransferTo( m_printData );
// Pass the devnames data back to the wxPrintData structure where it really belongs. // Pass the devnames data back to the wxPrintData structure where it really belongs.
if (pd->hDevNames) if (pd->hDevNames)
{ {
if (data->GetNativeDataDevNames()) if (data->GetDevNames())
{ {
// Make sure we don't leak memory // Make sure we don't leak memory
GlobalFree((HGLOBAL) data->GetNativeDataDevNames()); GlobalFree((HGLOBAL) data->GetDevNames());
} }
data->SetNativeDataDevNames((void*) pd->hDevNames); data->SetDevNames((void*) pd->hDevNames);
pd->hDevNames = NULL; pd->hDevNames = NULL;
} }
data->ConvertTo( m_printData ); data->TransferTo( m_printData );
pd->Flags = PSD_MARGINS|PSD_MINMARGINS; pd->Flags = PSD_MARGINS|PSD_MINMARGINS;

18
src/generic/prntdlgg.cpp
View File

@@ -113,12 +113,12 @@ wxPostScriptPrintNativeData::~wxPostScriptPrintNativeData()
{ {
} }
bool wxPostScriptPrintNativeData::ConvertTo( wxPrintData &data ) bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &data )
{ {
return true; return true;
} }
bool wxPostScriptPrintNativeData::ConvertFrom( const wxPrintData &data ) bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &data )
{ {
return true; return true;
} }
@@ -253,18 +253,16 @@ int wxGenericPrintDialog::ShowModal()
// present, but there might be in future. // present, but there might be in future.
// TransferDataFromWindow(); // TransferDataFromWindow();
wxGenericPrintSetupDialog *genericPrintSetupDialog = wxGenericPrintSetupDialog genericPrintSetupDialog( this, &m_printDialogData.GetPrintData() );
new wxGenericPrintSetupDialog(this, & m_printDialogData.GetPrintData()); int ret = genericPrintSetupDialog.ShowModal();
int ret = genericPrintSetupDialog->ShowModal(); if (ret != wxID_CANCEL)
if ( ret != wxID_CANCEL )
{ {
// Transfer settings to the print dialog's print data. // Transfer settings to the print dialog's print data.
m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData(); m_printDialogData.GetPrintData() = genericPrintSetupDialog.GetPrintData();
} }
// genericPrintSetupDialog->Destroy();
// Restore the wxPrintData settings again (uncomment if any settings become common // Restore the wxPrintData settings again (uncomment if any settings become
// to both dialogs) // common to both dialogs)
// TransferDataToWindow(); // TransferDataToWindow();
return ret; return ret;

4
src/msw/dcprint.cpp
View File

@@ -286,7 +286,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
wxWindowsPrintNativeData *data = wxWindowsPrintNativeData *data =
(wxWindowsPrintNativeData *) printDataConst.GetNativeData(); (wxWindowsPrintNativeData *) printDataConst.GetNativeData();
data->ConvertFrom( printDataConst ); data->TransferFrom( printDataConst );
wxChar* driverName = (wxChar*) NULL; wxChar* driverName = (wxChar*) NULL;
@@ -301,7 +301,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
LPDEVMODE lpDevMode = (LPDEVMODE) NULL; LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetNativeData(); HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
if ( hDevMode ) if ( hDevMode )
lpDevMode = (DEVMODE*) GlobalLock(hDevMode); lpDevMode = (DEVMODE*) GlobalLock(hDevMode);

4
src/msw/printdlg.cpp
View File

@@ -146,7 +146,7 @@ bool wxWindowsPrintNativeData::Ok() const
return (m_devMode != NULL) ; return (m_devMode != NULL) ;
} }
bool wxWindowsPrintNativeData::ConvertTo( wxPrintData &data ) bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
{ {
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode; HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames; HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
@@ -308,7 +308,7 @@ bool wxWindowsPrintNativeData::ConvertTo( wxPrintData &data )
return true; return true;
} }
bool wxWindowsPrintNativeData::ConvertFrom( const wxPrintData &data ) bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
{ {
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode; HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames; HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;