wxTextStream now interprets 1,1 as 1.1 (European formating).

[wxWidgets.git] / src / common / cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index d5772633af7c839ea79fc65a4e3680bfc47ec69c..045ff855563939604da7eddafbc42da3e97e7683 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -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;
@@ -196,8 +203,9 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
 {
 #ifdef __WXMSW__
     m_devMode = NULL;
+#elif defined( __WXMAC__ )
+       m_macPrintInfo = NULL ;
 #endif
-
     (*this) = printData;
 }
 
@@ -207,6 +215,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 +604,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;
@@ -653,6 +693,8 @@ wxPrintDialogData::wxPrintDialogData()
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;
+#elif defined( __WXMAC__ )
+       m_macPrintInfo = NULL ;
 #endif
     m_printFromPage = 0;
     m_printToPage = 0;
@@ -672,6 +714,11 @@ wxPrintDialogData::wxPrintDialogData()
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 {
+#ifdef __WXMSW__
+    m_printDlgData = NULL;
+#elif defined( __WXMAC__ )
+       m_macPrintInfo = NULL ;
+#endif
     (*this) = dialogData;
 }
 
@@ -679,6 +726,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 +755,9 @@ wxPrintDialogData::~wxPrintDialogData()
         GlobalFree(pd->hDevMode);
     if ( pd )
         delete pd;
+#elif defined(__WXMAC__)
+       if ( m_macPrintInfo )
+               ::DisposeHandle( (Handle) m_macPrintInfo ) ;
 #endif
 }
 
@@ -861,6 +913,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 +978,8 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
+#elif defined( __WXMAC__ )
+       m_macPageSetupInfo = NULL ;
 #endif
     m_paperSize = wxSize(0, 0);
 
@@ -916,6 +1002,11 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 {
+#if defined(__WIN95__)
+    m_pageSetupData = NULL;
+#elif defined( __WXMAC__ )
+       m_macPageSetupInfo = NULL ;
+#endif
     (*this) = dialogData;
 }
 
@@ -923,6 +1014,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 +1047,9 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
         GlobalFree(pd->hDevMode);
     if ( pd )
         delete pd;
+#elif defined( __WXMAC__ )
+       if( m_macPageSetupInfo )
+               ::DisposeHandle( (Handle) m_macPageSetupInfo ) ;
 #endif
 }
 
@@ -1126,6 +1222,69 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 }
 #endif // Win95
 
+#ifdef __WXMAC__
+void wxPageSetupDialogData::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 wxPageSetupDialogData::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)