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 d6d38e477c9da956268a18ceb5043c0ab297cf31..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,7 +79,6 @@
     #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)

-#endif

 
 #ifdef __WXMAC__
 #define mm2pt                  2.83464566929
 
 #ifdef __WXMAC__
 #define mm2pt                  2.83464566929


@@ -203,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;
 }
 


@@ -692,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;


@@ -711,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;
 }
 


@@ -994,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;
 }
 


@@ -1210,7 +1221,7 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 #endif // Win95
 
 #ifdef __WXMAC__
 #endif // Win95
 
 #ifdef __WXMAC__

-void wxPageSetupData::ConvertToNative()
+void wxPageSetupDialogData::ConvertToNative()

 {
        if ( !m_macPageSetupInfo )
        {
 {
        if ( !m_macPageSetupInfo )
        {


@@ -1239,7 +1250,7 @@ void wxPageSetupData::ConvertToNative()
        }
 }
 
        }
 }
 

-void wxPageSetupData::ConvertFromNative()
+void wxPageSetupDialogData::ConvertFromNative()

 {
        if ( m_macPageSetupInfo )
        {
 {
        if ( m_macPageSetupInfo )
        {