wxMac (debug) builds and runs wxMinimal again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
@@ -82,6 +82,11 @@
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
|
||||
#endif
|
||||
|
||||
#ifdef __WXMAC__
|
||||
#define mm2pt 2.83464566929
|
||||
#define pt2mm 0.352777777778
|
||||
#endif
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
// ============================================================================
|
||||
@@ -166,6 +171,8 @@ wxPrintData::wxPrintData()
|
||||
{
|
||||
#ifdef __WXMSW__
|
||||
m_devMode = NULL;
|
||||
#elif defined( __WXMAC__ )
|
||||
m_macPrintInfo = NULL ;
|
||||
#endif
|
||||
m_printOrientation = wxPORTRAIT;
|
||||
m_printNoCopies = 1;
|
||||
@@ -207,6 +214,9 @@ wxPrintData::~wxPrintData()
|
||||
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
|
||||
if (hDevMode )
|
||||
GlobalFree(hDevMode);
|
||||
#elif defined(__WXMAC__)
|
||||
if ( m_macPrintInfo )
|
||||
::DisposeHandle( (Handle) m_macPrintInfo ) ;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -593,6 +603,35 @@ void wxPrintData::ConvertFromNative()
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __WXMAC__
|
||||
void wxPrintData::ConvertToNative()
|
||||
{
|
||||
if ( !m_macPrintInfo )
|
||||
{
|
||||
m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
|
||||
if ( m_macPrintInfo )
|
||||
{
|
||||
::PrintDefault( m_macPrintInfo ) ;
|
||||
// todo setup the global pagesetup ?
|
||||
}
|
||||
}
|
||||
if ( m_macPrintInfo )
|
||||
{
|
||||
(**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
|
||||
(**m_macPrintInfo).prJob.iFstPage = 0 ;
|
||||
(**m_macPrintInfo).prJob.iLstPage = 0 ;
|
||||
}
|
||||
}
|
||||
|
||||
void wxPrintData::ConvertFromNative()
|
||||
{
|
||||
if ( m_macPrintInfo )
|
||||
{
|
||||
m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void wxPrintData::operator=(const wxPrintData& data)
|
||||
{
|
||||
m_printNoCopies = data.m_printNoCopies;
|
||||
@@ -679,6 +718,8 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
|
||||
{
|
||||
#ifdef __WXMSW__
|
||||
m_printDlgData = NULL;
|
||||
#elif defined( __WXMAC__ )
|
||||
m_macPrintInfo = NULL ;
|
||||
#endif
|
||||
m_printFromPage = 0;
|
||||
m_printToPage = 0;
|
||||
@@ -706,6 +747,9 @@ wxPrintDialogData::~wxPrintDialogData()
|
||||
GlobalFree(pd->hDevMode);
|
||||
if ( pd )
|
||||
delete pd;
|
||||
#elif defined(__WXMAC__)
|
||||
if ( m_macPrintInfo )
|
||||
::DisposeHandle( (Handle) m_macPrintInfo ) ;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -861,6 +905,38 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
|
||||
}
|
||||
#endif // MSW
|
||||
|
||||
#ifdef __WXMAC__
|
||||
void wxPrintDialogData::ConvertToNative()
|
||||
{
|
||||
if ( !m_macPrintInfo )
|
||||
{
|
||||
m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
|
||||
if ( m_macPrintInfo )
|
||||
{
|
||||
::PrintDefault( m_macPrintInfo ) ;
|
||||
// todo setup the global pagesetup ?
|
||||
}
|
||||
}
|
||||
if ( m_macPrintInfo )
|
||||
{
|
||||
(**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
|
||||
(**m_macPrintInfo).prJob.iFstPage = m_printFromPage ;
|
||||
(**m_macPrintInfo).prJob.iLstPage = m_printToPage ;
|
||||
}
|
||||
}
|
||||
|
||||
void wxPrintDialogData::ConvertFromNative()
|
||||
{
|
||||
if ( m_macPrintInfo )
|
||||
{
|
||||
m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
|
||||
m_printFromPage = (**m_macPrintInfo).prJob.iFstPage ;
|
||||
m_printToPage = (**m_macPrintInfo).prJob.iLstPage ;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void wxPrintDialogData::operator=(const wxPrintDialogData& data)
|
||||
{
|
||||
m_printFromPage = data.m_printFromPage;
|
||||
@@ -894,6 +970,8 @@ wxPageSetupDialogData::wxPageSetupDialogData()
|
||||
{
|
||||
#if defined(__WIN95__)
|
||||
m_pageSetupData = NULL;
|
||||
#elif defined( __WXMAC__ )
|
||||
m_macPageSetupInfo = NULL ;
|
||||
#endif
|
||||
m_paperSize = wxSize(0, 0);
|
||||
|
||||
@@ -923,6 +1001,8 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
|
||||
{
|
||||
#if defined(__WIN95__)
|
||||
m_pageSetupData = NULL;
|
||||
#elif defined( __WXMAC__ )
|
||||
m_macPageSetupInfo = NULL ;
|
||||
#endif
|
||||
m_paperSize = wxSize(0, 0);
|
||||
m_minMarginTopLeft = wxPoint(0, 0);
|
||||
@@ -954,6 +1034,9 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
|
||||
GlobalFree(pd->hDevMode);
|
||||
if ( pd )
|
||||
delete pd;
|
||||
#elif defined( __WXMAC__ )
|
||||
if( m_macPageSetupInfo )
|
||||
::DisposeHandle( (Handle) m_macPageSetupInfo ) ;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1126,6 +1209,69 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
|
||||
}
|
||||
#endif // Win95
|
||||
|
||||
#ifdef __WXMAC__
|
||||
void wxPageSetupData::ConvertToNative()
|
||||
{
|
||||
if ( !m_macPageSetupInfo )
|
||||
{
|
||||
m_macPageSetupInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
|
||||
if ( m_macPageSetupInfo )
|
||||
{
|
||||
::PrintDefault( m_macPageSetupInfo ) ;
|
||||
}
|
||||
}
|
||||
if ( m_macPageSetupInfo )
|
||||
{
|
||||
// on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
|
||||
(**m_macPageSetupInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt ) ;
|
||||
(**m_macPageSetupInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt ) ;
|
||||
|
||||
(**m_macPageSetupInfo).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt ) ;
|
||||
(**m_macPageSetupInfo).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt ) ;
|
||||
|
||||
(**m_macPageSetupInfo).prInfo.rPage.left = 0 ;
|
||||
(**m_macPageSetupInfo).prInfo.rPage.top = 0 ;
|
||||
(**m_macPageSetupInfo).prInfo.rPage.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt ) ;
|
||||
(**m_macPageSetupInfo).prInfo.rPage.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt ) ;
|
||||
|
||||
//TODO add custom fields in dialog for margins
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void wxPageSetupData::ConvertFromNative()
|
||||
{
|
||||
if ( m_macPageSetupInfo )
|
||||
{
|
||||
m_paperSize.x = ((double) (**m_macPageSetupInfo).rPaper.right - (**m_macPageSetupInfo).rPaper.left ) * pt2mm ;
|
||||
m_paperSize.y = ((double) (**m_macPageSetupInfo).rPaper.bottom - (**m_macPageSetupInfo).rPaper.top ) * pt2mm ;
|
||||
|
||||
m_minMarginTopLeft.x = ((double) -(**m_macPageSetupInfo).rPaper.left ) * pt2mm ;
|
||||
m_minMarginTopLeft.y = ((double) -(**m_macPageSetupInfo).rPaper.top ) * pt2mm ;
|
||||
|
||||
m_minMarginBottomRight.x = ((double) (**m_macPageSetupInfo).rPaper.right - (**m_macPageSetupInfo).prInfo.rPage.right ) * pt2mm ;
|
||||
m_minMarginBottomRight.y = ((double)(**m_macPageSetupInfo).rPaper.bottom - (**m_macPageSetupInfo).prInfo.rPage.bottom ) * pt2mm ;
|
||||
|
||||
// adjust minimal values
|
||||
//TODO add custom fields in dialog for margins
|
||||
|
||||
if ( m_marginTopLeft.x < m_minMarginTopLeft.x )
|
||||
m_marginTopLeft.x = m_minMarginTopLeft.x ;
|
||||
|
||||
if ( m_marginBottomRight.x < m_minMarginBottomRight.x )
|
||||
m_marginBottomRight.x = m_minMarginBottomRight.x ;
|
||||
|
||||
if ( m_marginTopLeft.y < m_minMarginTopLeft.y )
|
||||
m_marginTopLeft.y = m_minMarginTopLeft.y ;
|
||||
|
||||
if ( m_marginBottomRight.y < m_minMarginBottomRight.y )
|
||||
m_marginBottomRight.y = m_minMarginBottomRight.y ;
|
||||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// If a corresponding paper type is found in the paper database, will set the m_printData
|
||||
// paper size id member as well.
|
||||
void wxPageSetupDialogData::SetPaperSize(const wxSize& sz)
|
||||
|
||||
Reference in New Issue
Block a user