JPEG handler does not read entire file into memory anymore (+, of course, that header...

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 3d0f4aab6be2bf92e7da01a1f1c244f478bf06a4..04cd0ccdb214a382263aecb7ab56d88c817e5427 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -72,7 +72,6 @@
     #endif
 #endif // MSW
 
     #endif
 #endif // MSW
 

-#if !USE_SHARED_LIBRARY

     #if wxUSE_PRINTING_ARCHITECTURE
         IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
     #if wxUSE_PRINTING_ARCHITECTURE
         IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)


@@ -80,6 +79,10 @@
     #endif // wxUSE_PRINTING_ARCHITECTURE
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
     #endif // wxUSE_PRINTING_ARCHITECTURE
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)

+
+#ifdef __WXMAC__
+#define mm2pt                  2.83464566929
+#define pt2mm                  0.352777777778

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -149,29 +152,14 @@ wxFontData::wxFontData()
     enableEffects = TRUE;
     minSize = 0;
     maxSize = 0;
     enableEffects = TRUE;
     minSize = 0;
     maxSize = 0;

-}

 
 

-wxFontData::wxFontData(const wxFontData& data)
-{
-    (*this) = data;
+    m_encoding = wxFONTENCODING_SYSTEM;

 }
 
 wxFontData::~wxFontData()
 {
 }
 
 }
 
 wxFontData::~wxFontData()
 {
 }
 

-void wxFontData::operator=(const wxFontData& data)
-{
-    fontColour = data.fontColour;
-    showHelp = data.showHelp;
-    allowSymbols = data.allowSymbols;
-    enableEffects = data.enableEffects;
-    initialFont = data.initialFont;
-    chosenFont = data.chosenFont;
-    minSize = data.minSize;
-    maxSize = data.maxSize;
-}
-

 #if wxUSE_PRINTING_ARCHITECTURE
 // ----------------------------------------------------------------------------
 // Print data
 #if wxUSE_PRINTING_ARCHITECTURE
 // ----------------------------------------------------------------------------
 // Print data


@@ -181,6 +169,8 @@ wxPrintData::wxPrintData()
 {
 #ifdef __WXMSW__
     m_devMode = NULL;
 {
 #ifdef __WXMSW__
     m_devMode = NULL;

+#elif defined( __WXMAC__ )
+       m_macPrintInfo = NULL ;

 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;


@@ -211,8 +201,9 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
 {
 #ifdef __WXMSW__
     m_devMode = NULL;
 {
 #ifdef __WXMSW__
     m_devMode = NULL;

+#elif defined( __WXMAC__ )
+       m_macPrintInfo = NULL ;

 #endif
 #endif

-

     (*this) = printData;
 }
 
     (*this) = printData;
 }
 


@@ -222,6 +213,9 @@ wxPrintData::~wxPrintData()
     HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
     if (hDevMode )
         GlobalFree(hDevMode);
     HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
     if (hDevMode )
         GlobalFree(hDevMode);

+#elif defined(__WXMAC__)
+       if ( m_macPrintInfo )
+               ::DisposeHandle( (Handle) m_macPrintInfo ) ;

 #endif
 }
 
 #endif
 }
 


@@ -608,6 +602,35 @@ void wxPrintData::ConvertFromNative()
 
 #endif
 
 
 #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;
 void wxPrintData::operator=(const wxPrintData& data)
 {
     m_printNoCopies = data.m_printNoCopies;


@@ -668,6 +691,8 @@ wxPrintDialogData::wxPrintDialogData()
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;

+#elif defined( __WXMAC__ )
+       m_macPrintInfo = NULL ;

 #endif
     m_printFromPage = 0;
     m_printToPage = 0;
 #endif
     m_printFromPage = 0;
     m_printToPage = 0;


@@ -687,6 +712,11 @@ wxPrintDialogData::wxPrintDialogData()
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 {
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 {

+#ifdef __WXMSW__
+    m_printDlgData = NULL;
+#elif defined( __WXMAC__ )
+       m_macPrintInfo = NULL ;
+#endif

     (*this) = dialogData;
 }
 
     (*this) = dialogData;
 }
 


@@ -694,6 +724,8 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;

+#elif defined( __WXMAC__ )
+       m_macPrintInfo = NULL ;

 #endif
     m_printFromPage = 0;
     m_printToPage = 0;
 #endif
     m_printFromPage = 0;
     m_printToPage = 0;


@@ -721,6 +753,9 @@ wxPrintDialogData::~wxPrintDialogData()
         GlobalFree(pd->hDevMode);
     if ( pd )
         delete pd;
         GlobalFree(pd->hDevMode);
     if ( pd )
         delete pd;

+#elif defined(__WXMAC__)
+       if ( m_macPrintInfo )
+               ::DisposeHandle( (Handle) m_macPrintInfo ) ;

 #endif
 }
 
 #endif
 }
 


@@ -876,6 +911,38 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
 }
 #endif // MSW
 
 }
 #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;
 void wxPrintDialogData::operator=(const wxPrintDialogData& data)
 {
     m_printFromPage = data.m_printFromPage;


@@ -909,6 +976,8 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;

+#elif defined( __WXMAC__ )
+       m_macPageSetupInfo = NULL ;

 #endif
     m_paperSize = wxSize(0, 0);
 
 #endif
     m_paperSize = wxSize(0, 0);
 


@@ -931,6 +1000,11 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 {
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 {

+#if defined(__WIN95__)
+    m_pageSetupData = NULL;
+#elif defined( __WXMAC__ )
+       m_macPageSetupInfo = NULL ;
+#endif

     (*this) = dialogData;
 }
 
     (*this) = dialogData;
 }
 


@@ -938,6 +1012,8 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;

+#elif defined( __WXMAC__ )
+       m_macPageSetupInfo = NULL ;

 #endif
     m_paperSize = wxSize(0, 0);
     m_minMarginTopLeft = wxPoint(0, 0);
 #endif
     m_paperSize = wxSize(0, 0);
     m_minMarginTopLeft = wxPoint(0, 0);


@@ -969,6 +1045,9 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
         GlobalFree(pd->hDevMode);
     if ( pd )
         delete pd;
         GlobalFree(pd->hDevMode);
     if ( pd )
         delete pd;

+#elif defined( __WXMAC__ )
+       if( m_macPageSetupInfo )
+               ::DisposeHandle( (Handle) m_macPageSetupInfo ) ;

 #endif
 }
 
 #endif
 }
 


@@ -1141,6 +1220,69 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 }
 #endif // Win95
 
 }
 #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)
 // 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)