restore the stream position in wxImageHandler itself instead of forcing all

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 57c36a0a7c72d853ac549db3c0660045be73e4b0..9080a155e9af89c51a1d6edb05111ffb2539aaac 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -39,8 +39,12 @@
 #include "wx/cmndata.h"
 #include "wx/log.h"
 
 #include "wx/cmndata.h"
 #include "wx/log.h"
 

+#if wxUSE_FONTDLG
+    #include "wx/fontdlg.h"
+#endif // wxUSE_FONTDLG
+

 // For compatibility
 // For compatibility

-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXX11__)|| defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 
     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 


@@ -83,7 +87,17 @@
 
 #ifdef __WXMAC__
     #include "wx/mac/uma.h"
 
 #ifdef __WXMAC__
     #include "wx/mac/uma.h"

-    
+
+#if defined(TARGET_CARBON) && !defined(__DARWIN__)
+#  if PM_USE_SESSION_APIS
+#    include <PMCore.h>
+#  endif
+#  include <PMApplication.h>
+#endif
+
+#ifndef __DARWIN__
+    #include "Printing.h"
+#endif

     #define mm2pt            2.83464566929
     #define pt2mm            0.352777777778
 #endif // Mac
     #define mm2pt            2.83464566929
     #define pt2mm            0.352777777778
 #endif // Mac


@@ -111,6 +125,7 @@ wxColourData::wxColourData()
 }
 
 wxColourData::wxColourData(const wxColourData& data)
 }
 
 wxColourData::wxColourData(const wxColourData& data)

+    : wxObject()

 {
     (*this) = data;
 }
 {
     (*this) = data;
 }


@@ -119,7 +134,7 @@ wxColourData::~wxColourData()
 {
 }
 
 {
 }
 

-void wxColourData::SetCustomColour(int i, wxColour& colour)
+void wxColourData::SetCustomColour(int i, const wxColour& colour)

 {
     if (i > 15 || i < 0)
         return;
 {
     if (i > 15 || i < 0)
         return;


@@ -167,6 +182,14 @@ wxFontData::~wxFontData()
 {
 }
 
 {
 }
 

+#if wxUSE_FONTDLG
+
+wxFontDialogBase::~wxFontDialogBase()
+{
+}
+
+#endif // wxUSE_FONTDLG
+

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


@@ -181,49 +204,51 @@ wxPrintData::wxPrintData()
 #if TARGET_CARBON
     m_macPageFormat = kPMNoPageFormat;
     m_macPrintSettings = kPMNoPrintSettings;
 #if TARGET_CARBON
     m_macPageFormat = kPMNoPageFormat;
     m_macPrintSettings = kPMNoPrintSettings;

-    
+

   #if PM_USE_SESSION_APIS
     PMPrintSession macPrintSession = kPMNoReference;
     OSStatus       err;
   #if PM_USE_SESSION_APIS
     PMPrintSession macPrintSession = kPMNoReference;
     OSStatus       err;

-    
-       err = ::UMAPrOpen(&macPrintSession) ;
-       if ( err == noErr )
-       {  
-               err = PMCreatePageFormat(&m_macPageFormat);
-               
-               //  Note that PMPageFormat is not session-specific, but calling
-               //  PMSessionDefaultPageFormat assigns values specific to the printer
-               //  associated with the current printing session.
-               if ((err == noErr) && (m_macPageFormat != kPMNoPageFormat))
-               {
-               err = PMSessionDefaultPageFormat(macPrintSession, m_macPageFormat);
-               }
-
-               err = PMCreatePrintSettings(&m_macPrintSettings);
-
-               //  Note that PMPrintSettings is not session-specific, but calling
-               //  PMSessionDefaultPrintSettings assigns values specific to the printer
-               //  associated with the current printing session.
-               if ((err == noErr) && (m_macPrintSettings != kPMNoPrintSettings))
-               {
-               err = PMSessionDefaultPrintSettings(macPrintSession, m_macPrintSettings);
-               }
-       }
-       ::UMAPrClose(&macPrintSession) ;
+
+    err = ::UMAPrOpen(&macPrintSession) ;
+    if ( err == noErr )
+    {
+        err = PMCreatePageFormat((PMPageFormat *)&m_macPageFormat);
+
+        //  Note that PMPageFormat is not session-specific, but calling
+        //  PMSessionDefaultPageFormat assigns values specific to the printer
+        //  associated with the current printing session.
+        if ((err == noErr) && (m_macPageFormat != kPMNoPageFormat))
+        {
+            err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession,
+                                             (PMPageFormat)m_macPageFormat);
+        }
+
+        err = PMCreatePrintSettings((PMPrintSettings *)&m_macPrintSettings);
+
+        //  Note that PMPrintSettings is not session-specific, but calling
+        //  PMSessionDefaultPrintSettings assigns values specific to the printer
+        //  associated with the current printing session.
+        if ((err == noErr) && (m_macPrintSettings != kPMNoPrintSettings))
+        {
+            err = PMSessionDefaultPrintSettings((PMPrintSession)macPrintSession,
+                                                (PMPrintSettings)m_macPrintSettings);
+        }
+    }
+    ::UMAPrClose(&macPrintSession) ;

   #endif
 #else
   #endif
 #else

-    m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) );
-    (**(THPrint)m_macPrintInfo).iPrVersion = 0;                    // something invalid
+    m_macPrintSettings = (THPrint) NewHandleClear( sizeof( TPrint ) );
+    (**(THPrint)m_macPrintSettings).iPrVersion = 0;                    // something invalid

 
 

-    (**(THPrint)m_macPrintInfo).prInfo.iHRes = 72;
-    (**(THPrint)m_macPrintInfo).prInfo.iVRes = 72;
+    (**(THPrint)m_macPrintSettings).prInfo.iHRes = 72;
+    (**(THPrint)m_macPrintSettings).prInfo.iVRes = 72;

     Rect r1 = { 0, 0, 8*72 - 2 * 18, 11*72 - 2 * 36 };
     Rect r1 = { 0, 0, 8*72 - 2 * 18, 11*72 - 2 * 36 };

-    (**(THPrint)m_macPrintInfo).prInfo.rPage = r1;// must have its top left & (0,0)
+    (**(THPrint)m_macPrintSettings).prInfo.rPage = r1;// must have its top left & (0,0)

 
     Rect r2 = { -18, -36, 8*72 - 18, 11*72 - 36  };
 
     Rect r2 = { -18, -36, 8*72 - 18, 11*72 - 36  };

-    (**(THPrint)m_macPrintInfo).rPaper = r2;
-    (**(THPrint)m_macPrintInfo).prStl.iPageV = 11 * 120 ;                // 11 inches in 120th of an inch
-    (**(THPrint)m_macPrintInfo).prStl.iPageH = 8 * 120 ;                // 8 inches in 120th of an inch
+    (**(THPrint)m_macPrintSettings).rPaper = r2;
+    (**(THPrint)m_macPrintSettings).prStl.iPageV = 11 * 120 ;                // 11 inches in 120th of an inch
+    (**(THPrint)m_macPrintSettings).prStl.iPageH = 8 * 120 ;                // 8 inches in 120th of an inch

 #endif
 #endif
     m_printOrientation = wxPORTRAIT;
 #endif
 #endif
     m_printOrientation = wxPORTRAIT;


@@ -252,6 +277,7 @@ wxPrintData::wxPrintData()
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)

+    : wxObject()

 {
 #ifdef __WXMSW__
     m_devMode = (void*) NULL;
 {
 #ifdef __WXMSW__
     m_devMode = (void*) NULL;


@@ -261,7 +287,7 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
     m_macPageFormat    = kPMNoPageFormat;
     m_macPrintSettings = kPMNoPrintSettings;
 #else
     m_macPageFormat    = kPMNoPageFormat;
     m_macPrintSettings = kPMNoPrintSettings;
 #else

-    m_macPrintInfo = NULL;
+    m_macPrintSettings = NULL;

 #endif
 #endif
     (*this) = printData;
 #endif
 #endif
     (*this) = printData;


@@ -297,9 +323,9 @@ wxPrintData::~wxPrintData()
   #endif
         m_macPrintSettings = kPMNoPrintSettings;
     }
   #endif
         m_macPrintSettings = kPMNoPrintSettings;
     }

-    
+

 #else
 #else

-    wxASSERT( m_macPrintInfo );
+    wxASSERT( m_macPrintSettings );

     // we should perhaps delete
 #endif
 #endif
     // we should perhaps delete
 #endif
 #endif


@@ -768,7 +794,7 @@ void wxPrintData::ConvertToNative()
 {
 #if TARGET_CARBON
 #else
 {
 #if TARGET_CARBON
 #else

-    (**(THPrint)m_macPrintInfo).prJob.iCopies = m_printNoCopies;
+    (**(THPrint)m_macPrintSettings).prJob.iCopies = m_printNoCopies;

 #endif
 }
 
 #endif
 }
 


@@ -776,7 +802,7 @@ void wxPrintData::ConvertFromNative()
 {
 #if TARGET_CARBON
 #else
 {
 #if TARGET_CARBON
 #else

-    m_printNoCopies = (**(THPrint)m_macPrintInfo).prJob.iCopies;
+    m_printNoCopies = (**(THPrint)m_macPrintSettings).prJob.iCopies;

 #endif
 }
 #endif
 #endif
 }
 #endif


@@ -786,8 +812,8 @@ void wxPrintData::operator=(const wxPrintData& data)
 #ifdef __WXMAC__
 #if TARGET_CARBON
 #else
 #ifdef __WXMAC__
 #if TARGET_CARBON
 #else

-    m_macPrintInfo = data.m_macPrintInfo;
-    HandToHand( (Handle*) &m_macPrintInfo );
+    m_macPrintSettings = data.m_macPrintSettings;
+    HandToHand( (Handle*) &m_macPrintSettings );

 #endif
 #endif
     m_printNoCopies = data.m_printNoCopies;
 #endif
 #endif
     m_printNoCopies = data.m_printNoCopies;


@@ -839,6 +865,16 @@ void wxPrintData::operator=(const wxPrintSetupData& setupData)
 }
 #endif // wxCOMPATIBILITY_WITH_PRINTSETUPDATA
 
 }
 #endif // wxCOMPATIBILITY_WITH_PRINTSETUPDATA
 

+// Is this data OK for showing the print dialog?
+bool wxPrintData::Ok() const
+{
+#ifdef __WXMSW__
+    ((wxPrintData*)this)->ConvertToNative();
+    return (m_devMode != NULL) ;
+#else
+    return TRUE;
+#endif
+}

 
 // ----------------------------------------------------------------------------
 // Print dialog data
 
 // ----------------------------------------------------------------------------
 // Print dialog data


@@ -866,6 +902,7 @@ wxPrintDialogData::wxPrintDialogData()
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)

+    : wxObject()

 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;


@@ -952,7 +989,8 @@ void wxPrintDialogData::ConvertToNative()
 
     m_printData.SetNativeData((void*) NULL);
 
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+    // 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!"));

 
     pd->hDevNames = (HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames();
 
 
     pd->hDevNames = (HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames();
 


@@ -1088,8 +1126,8 @@ void wxPrintDialogData::ConvertToNative()
 {
 #if TARGET_CARBON
 #else
 {
 #if TARGET_CARBON
 #else

-    (**(THPrint)m_printData.m_macPrintInfo).prJob.iFstPage = m_printFromPage;
-    (**(THPrint)m_printData.m_macPrintInfo).prJob.iLstPage = m_printToPage;
+    (**(THPrint)m_printData.m_macPrintSettings).prJob.iFstPage = m_printFromPage;
+    (**(THPrint)m_printData.m_macPrintSettings).prJob.iLstPage = m_printToPage;

     m_printData.ConvertToNative();
 #endif
 }
     m_printData.ConvertToNative();
 #endif
 }


@@ -1099,8 +1137,8 @@ void wxPrintDialogData::ConvertFromNative()
 #if TARGET_CARBON
 #else
     m_printData.ConvertFromNative();
 #if TARGET_CARBON
 #else
     m_printData.ConvertFromNative();

-    m_printFromPage = (**(THPrint)m_printData.m_macPrintInfo).prJob.iFstPage;
-    m_printToPage = (**(THPrint)m_printData.m_macPrintInfo).prJob.iLstPage;
+    m_printFromPage = (**(THPrint)m_printData.m_macPrintSettings).prJob.iFstPage;
+    m_printToPage = (**(THPrint)m_printData.m_macPrintSettings).prJob.iLstPage;

 #endif
 }
 #endif
 #endif
 }
 #endif


@@ -1160,6 +1198,7 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)

+    : wxObject()

 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;


@@ -1207,7 +1246,7 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
 #endif
 }
 
 #endif
 }
 

-void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)

 {
     m_paperSize = data.m_paperSize;
     m_minMarginTopLeft = data.m_minMarginTopLeft;
 {
     m_paperSize = data.m_paperSize;
     m_minMarginTopLeft = data.m_minMarginTopLeft;


@@ -1223,11 +1262,15 @@ void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;

+
+    return *this;

 }
 
 }
 

-void wxPageSetupDialogData::operator=(const wxPrintData& data)
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)

 {
     m_printData = data;
 {
     m_printData = data;

+
+    return *this;

 }
 
 #if defined(__WIN95__)
 }
 
 #if defined(__WIN95__)


@@ -1259,7 +1302,8 @@ void wxPageSetupDialogData::ConvertToNative()
 
     m_printData.SetNativeData((void*) NULL);
 
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+    // 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!"));

 
     // Pass the devnames data (created in m_printData.ConvertToNative)
     // to the PRINTDLG structure, since it'll
 
     // Pass the devnames data (created in m_printData.ConvertToNative)
     // to the PRINTDLG structure, since it'll


@@ -1413,16 +1457,16 @@ void wxPageSetupDialogData::ConvertToNative()
     // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
 #if TARGET_CARBON
 #else
     // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
 #if TARGET_CARBON
 #else

-    (**(THPrint)m_printData.m_macPrintInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt );
-    (**(THPrint)m_printData.m_macPrintInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt );

 
 

-    (**(THPrint)m_printData.m_macPrintInfo).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt );
-    (**(THPrint)m_printData.m_macPrintInfo).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt );

 
 

-    (**(THPrint)m_printData.m_macPrintInfo).prInfo.rPage.left = 0;
-    (**(THPrint)m_printData.m_macPrintInfo).prInfo.rPage.top = 0;
-    (**(THPrint)m_printData.m_macPrintInfo).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt );
-    (**(THPrint)m_printData.m_macPrintInfo).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.left = 0;
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.top = 0;
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt );

 #endif
 }
 
 #endif
 }
 


@@ -1432,14 +1476,14 @@ void wxPageSetupDialogData::ConvertFromNative()
 
 #if TARGET_CARBON
 #else
 
 #if TARGET_CARBON
 #else

-    m_paperSize.x = ((double) (**(THPrint)m_printData.m_macPrintInfo).rPaper.right - (**(THPrint)m_printData.m_macPrintInfo).rPaper.left ) * pt2mm;
-    m_paperSize.y = ((double) (**(THPrint)m_printData.m_macPrintInfo).rPaper.bottom - (**(THPrint)m_printData.m_macPrintInfo).rPaper.top ) * pt2mm;
+    m_paperSize.x = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ) * pt2mm;
+    m_paperSize.y = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ) * pt2mm;

 
 

-    m_minMarginTopLeft.x = ((double) -(**(THPrint)m_printData.m_macPrintInfo).rPaper.left ) * pt2mm;
-    m_minMarginTopLeft.y = ((double) -(**(THPrint)m_printData.m_macPrintInfo).rPaper.top ) * pt2mm;
+    m_minMarginTopLeft.x = ((double) -(**(THPrint)m_printData.m_macPrintSettings).rPaper.left ) * pt2mm;
+    m_minMarginTopLeft.y = ((double) -(**(THPrint)m_printData.m_macPrintSettings).rPaper.top ) * pt2mm;

 
 

-    m_minMarginBottomRight.x = ((double) (**(THPrint)m_printData.m_macPrintInfo).rPaper.right - (**(THPrint)m_printData.m_macPrintInfo).prInfo.rPage.right ) * pt2mm;
-    m_minMarginBottomRight.y = ((double)(**(THPrint)m_printData.m_macPrintInfo).rPaper.bottom - (**(THPrint)m_printData.m_macPrintInfo).prInfo.rPage.bottom ) * pt2mm;
+    m_minMarginBottomRight.x = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right ) * pt2mm;
+    m_minMarginBottomRight.y = ((double)(**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom ) * pt2mm;

 #endif
     // adjust minimal values
     //TODO add custom fields in dialog for margins
 #endif
     // adjust minimal values
     //TODO add custom fields in dialog for margins


@@ -1500,12 +1544,9 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 

-    if (sz.x != 0)
-    {
-        // sz is in 10ths of a mm, so multiply by 10.
-        m_paperSize.x = sz.x * 10;
-        m_paperSize.y = sz.y * 10;
-    }
+    // sz is in 10ths of a mm, while paper size is in mm
+    m_paperSize.x = sz.x / 10;
+    m_paperSize.y = sz.y / 10;

 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE