wxListCtrl::InsertItem returns the index of the inserted item

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 08bd0fa4de9751f78c4495a059efa9c1b31c03d2..387b2c7f935602576e404155c9cfc91fd94b0339 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -9,66 +9,93 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "cmndata.h"
+    #pragma implementation "cmndata.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/string.h"
-#include "wx/utils.h"
-#include "wx/app.h"
+    #include <stdio.h>
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"

 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"

-#include "wx/paper.h"
+#include "wx/log.h"

 
 // For compatibility
 #if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
 
 // For compatibility
 #if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT

-#include "wx/generic/dcpsg.h"
+    #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1

 #endif
 
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+    #include "wx/paper.h"
+
+    #if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
+        #include "wx/generic/dcpsg.h"
+    #endif
+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-#include <windows.h>
+    #include <windows.h>
+    #include <wx/msw/private.h>

 
 

-#if !defined(__WIN32__)
-#include <print.h>
-#include <commdlg.h>
-#endif
+    #if !defined(__WIN32__)
+        #include <print.h>
+        #include <commdlg.h>
+    #endif // Win16

 
 

-#if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
-#include <windowsx.h>
-#include <commdlg.h>
-#endif
+    #ifdef __WXWINE__
+        #include <cderr.h>
+        #include <commdlg.h>
+    #endif

 
 

-#endif
+    #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
+        #include <windowsx.h>
+        #include <commdlg.h>
+    #endif
+#endif // MSW

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+    #if wxUSE_PRINTING_ARCHITECTURE
+        IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+        IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+        IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
+    #endif // wxUSE_PRINTING_ARCHITECTURE
+    IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)

 #endif
 
 #endif
 

-/*
-* wxColourData
-*/
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxColourData
+// ----------------------------------------------------------------------------

 
 wxColourData::wxColourData()
 {
     int i;
     for (i = 0; i < 16; i++)
         custColours[i].Set(255, 255, 255);
 
 wxColourData::wxColourData()
 {
     int i;
     for (i = 0; i < 16; i++)
         custColours[i].Set(255, 255, 255);

-    
+

     chooseFull = FALSE;
     dataColour.Set(0,0,0);
 }
     chooseFull = FALSE;
     dataColour.Set(0,0,0);
 }


@@ -86,7 +113,7 @@ void wxColourData::SetCustomColour(int i, wxColour& colour)
 {
     if (i > 15 || i < 0)
         return;
 {
     if (i > 15 || i < 0)
         return;

-    
+

     custColours[i] = colour;
 }
 
     custColours[i] = colour;
 }
 


@@ -94,7 +121,7 @@ wxColour wxColourData::GetCustomColour(int i)
 {
     if (i > 15 || i < 0)
         return wxColour(0,0,0);
 {
     if (i > 15 || i < 0)
         return wxColour(0,0,0);

-    
+

     return custColours[i];
 }
 
     return custColours[i];
 }
 


@@ -103,20 +130,20 @@ void wxColourData::operator=(const wxColourData& data)
     int i;
     for (i = 0; i < 16; i++)
         custColours[i] = data.custColours[i];
     int i;
     for (i = 0; i < 16; i++)
         custColours[i] = data.custColours[i];

-    
+

     dataColour = (wxColour&)data.dataColour;
     chooseFull = data.chooseFull;
 }
 
     dataColour = (wxColour&)data.dataColour;
     chooseFull = data.chooseFull;
 }
 

-/*
-* Font data
-*/
+// ----------------------------------------------------------------------------
+// Font data
+// ----------------------------------------------------------------------------

 
 wxFontData::wxFontData()
 {
     // Intialize colour to black.
     fontColour.Set(0, 0, 0);
 
 wxFontData::wxFontData()
 {
     // Intialize colour to black.
     fontColour.Set(0, 0, 0);

-    
+

     showHelp = FALSE;
     allowSymbols = TRUE;
     enableEffects = TRUE;
     showHelp = FALSE;
     allowSymbols = TRUE;
     enableEffects = TRUE;


@@ -145,9 +172,10 @@ void wxFontData::operator=(const wxFontData& data)
     maxSize = data.maxSize;
 }
 
     maxSize = data.maxSize;
 }
 

-/*
-* Print data
-*/
+#if wxUSE_PRINTING_ARCHITECTURE
+// ----------------------------------------------------------------------------
+// Print data
+// ----------------------------------------------------------------------------

 
 wxPrintData::wxPrintData()
 {
 
 wxPrintData::wxPrintData()
 {


@@ -157,7 +185,7 @@ wxPrintData::wxPrintData()
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = FALSE;
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = FALSE;

-    
+

     // New, 24/3/99
     m_printerName = "";
     m_colour = TRUE;
     // New, 24/3/99
     m_printerName = "";
     m_colour = TRUE;


@@ -181,51 +209,84 @@ wxPrintData::wxPrintData()
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {

+#ifdef __WXMSW__
+    m_devMode = NULL;
+#endif
+

     (*this) = printData;
 }
 
 wxPrintData::~wxPrintData()
 {
 #ifdef __WXMSW__
     (*this) = printData;
 }
 
 wxPrintData::~wxPrintData()
 {
 #ifdef __WXMSW__

-    HGLOBAL hDevMode = (HGLOBAL) hDevMode;
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;

     if (hDevMode )
         GlobalFree(hDevMode);
     if (hDevMode )
         GlobalFree(hDevMode);

-   /*
-        PRINTDLG *pd = (PRINTDLG *) m_printData;
-        if ( pd && pd->hDevMode )
-        GlobalFree(pd->hDevMode);
-        if ( pd )
-        delete pd;
-    */

 #endif
 }
 
 #endif
 }
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) // && defined(__WIN32__)
+
+#ifdef __WIN32__
+static wxString wxGetPrintDlgError()
+{
+    DWORD err = CommDlgExtendedError();
+    wxString msg = _T("Unknown");
+    switch (err)
+    {
+        case CDERR_FINDRESFAILURE: msg = _T("CDERR_FINDRESFAILURE"); break;
+        case CDERR_INITIALIZATION: msg = _T("CDERR_INITIALIZATION"); break;
+        case CDERR_LOADRESFAILURE: msg = _T("CDERR_LOADRESFAILURE"); break;
+        case CDERR_LOADSTRFAILURE: msg = _T("CDERR_LOADSTRFAILURE"); break;
+        case CDERR_LOCKRESFAILURE: msg = _T("CDERR_LOCKRESFAILURE"); break;
+        case CDERR_MEMALLOCFAILURE: msg = _T("CDERR_MEMALLOCFAILURE"); break;
+        case CDERR_MEMLOCKFAILURE: msg = _T("CDERR_MEMLOCKFAILURE"); break;
+        case CDERR_NOHINSTANCE: msg = _T("CDERR_NOHINSTANCE"); break;
+        case CDERR_NOHOOK: msg = _T("CDERR_NOHOOK"); break;
+        case CDERR_NOTEMPLATE: msg = _T("CDERR_NOTEMPLATE"); break;
+        case CDERR_STRUCTSIZE: msg = _T("CDERR_STRUCTSIZE"); break;
+        case  PDERR_RETDEFFAILURE: msg = _T("PDERR_RETDEFFAILURE"); break;
+        case  PDERR_PRINTERNOTFOUND: msg = _T("PDERR_PRINTERNOTFOUND"); break;
+        case  PDERR_PARSEFAILURE: msg = _T("PDERR_PARSEFAILURE"); break;
+        case  PDERR_NODEVICES: msg = _T("PDERR_NODEVICES"); break;
+        case  PDERR_NODEFAULTPRN: msg = _T("PDERR_NODEFAULTPRN"); break;
+        case  PDERR_LOADDRVFAILURE: msg = _T("PDERR_LOADDRVFAILURE"); break;
+        case  PDERR_INITFAILURE: msg = _T("PDERR_INITFAILURE"); break;
+        case  PDERR_GETDEVMODEFAIL: msg = _T("PDERR_GETDEVMODEFAIL"); break;
+        case  PDERR_DNDMMISMATCH: msg = _T("PDERR_DNDMMISMATCH"); break;
+        case  PDERR_DEFAULTDIFFERENT: msg = _T("PDERR_DEFAULTDIFFERENT"); break;
+        case  PDERR_CREATEICFAILURE: msg = _T("PDERR_CREATEICFAILURE"); break;
+        default: break;
+    }
+    return msg;
+}
+#endif

 
 void wxPrintData::ConvertToNative()
 {
 
 void wxPrintData::ConvertToNative()
 {

-    HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;

     if (!hDevMode)
     {
         // Use PRINTDLG as a way of creating a DEVMODE object
         PRINTDLG *pd = new PRINTDLG;
     if (!hDevMode)
     {
         // Use PRINTDLG as a way of creating a DEVMODE object
         PRINTDLG *pd = new PRINTDLG;

-        
+

         // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
 #ifdef __GNUWIN32__
         // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
 #ifdef __GNUWIN32__

+        memset(pd, 0, 66);

         pd->lStructSize    = 66 ;
         pd->lStructSize    = 66 ;

-        memset(pd, 0, sizeof(PRINTDLG));

 #else
 #else

-        pd->lStructSize    = sizeof(PRINTDLG);

         memset(pd, 0, sizeof(PRINTDLG));
         memset(pd, 0, sizeof(PRINTDLG));

+        pd->lStructSize    = sizeof(PRINTDLG);

 #endif
 
         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto
 #endif
 
         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto

-        
+        pd->hInstance      = (HINSTANCE) wxGetInstance();
+

         pd->Flags          = PD_RETURNDEFAULT;
         pd->nCopies        = 1;
         pd->Flags          = PD_RETURNDEFAULT;
         pd->nCopies        = 1;

-        
+

         // Fill out the DEVMODE structure
         // so we can use it as input in the 'real' PrintDlg
         if (!PrintDlg(pd))
         // Fill out the DEVMODE structure
         // so we can use it as input in the 'real' PrintDlg
         if (!PrintDlg(pd))


@@ -236,6 +297,12 @@ void wxPrintData::ConvertToNative()
                 GlobalFree(pd->hDevNames);
             pd->hDevMode = NULL;
             pd->hDevNames = NULL;
                 GlobalFree(pd->hDevNames);
             pd->hDevMode = NULL;
             pd->hDevNames = NULL;

+
+#if defined(__WXDEBUG__) && defined(__WIN32__)
+            wxString str(_T("Printing error: "));
+            str += wxGetPrintDlgError();
+            wxLogDebug(str);
+#endif

         }
         else
         {
         }
         else
         {


@@ -244,35 +311,39 @@ void wxPrintData::ConvertToNative()
             pd->hDevNames = NULL;
 
             hDevMode = pd->hDevMode;
             pd->hDevNames = NULL;
 
             hDevMode = pd->hDevMode;

-            m_devMode = (void*) hDevMode;
+            m_devMode = (void*)(long) hDevMode;

             pd->hDevMode = NULL;
         }
 
         delete pd;
     }
             pd->hDevMode = NULL;
         }
 
         delete pd;
     }

-    
+

     if ( hDevMode )
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
     if ( hDevMode )
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);

-        
+

         //// Orientation
         //// Orientation

-        
+
+#ifndef __WXWINE__

         devMode->dmOrientation = m_printOrientation;
         devMode->dmOrientation = m_printOrientation;

+#endif

         devMode->dmFields = DM_ORIENTATION;
         devMode->dmFields = DM_ORIENTATION;

-        
+

         //// Collation
         //// Collation

-        
+
+#ifndef __WIN16__

         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;
         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;

-        
+#endif
+

         //// Number of copies
         //// Number of copies

-        
+

         devMode->dmCopies = m_printNoCopies;
         devMode->dmFields |= DM_COPIES;
         devMode->dmCopies = m_printNoCopies;
         devMode->dmFields |= DM_COPIES;

-        
+

         //// Printer name
         //// Printer name

-        
-        if (m_printerName != "")
+
+        if (m_printerName != _T(""))

         {
             // TODO: make this Unicode compatible
             int len = wxMin(31, m_printerName.Len());
         {
             // TODO: make this Unicode compatible
             int len = wxMin(31, m_printerName.Len());


@@ -281,18 +352,19 @@ void wxPrintData::ConvertToNative()
                 devMode->dmDeviceName[i] = m_printerName.GetChar(i);
             devMode->dmDeviceName[i] = 0;
         }
                 devMode->dmDeviceName[i] = m_printerName.GetChar(i);
             devMode->dmDeviceName[i] = 0;
         }

-        
+

         //// Colour
         //// Colour

-        
+

         if (m_colour)
             devMode->dmColor = DMCOLOR_COLOR;
         else
             devMode->dmColor = DMCOLOR_MONOCHROME;
         if (m_colour)
             devMode->dmColor = DMCOLOR_COLOR;
         else
             devMode->dmColor = DMCOLOR_MONOCHROME;

-        
+

         devMode->dmFields |= DM_COLOR;
         devMode->dmFields |= DM_COLOR;

-        
+
+#ifndef __WXWINE__

         //// Paper size
         //// Paper size

-        
+

         if (m_paperId == wxPAPER_NONE)
         {
             devMode->dmPaperWidth = m_paperSize.x * 10;
         if (m_paperId == wxPAPER_NONE)
         {
             devMode->dmPaperWidth = m_paperSize.x * 10;


@@ -312,9 +384,10 @@ void wxPrintData::ConvertToNative()
                 }
             }
         }
                 }
             }
         }

-        
+#endif
+

         //// Duplex
         //// Duplex

-        
+

         int duplex;
         switch (m_duplexMode)
         {
         int duplex;
         switch (m_duplexMode)
         {


@@ -331,9 +404,9 @@ void wxPrintData::ConvertToNative()
         }
         devMode->dmDuplex = duplex;
         devMode->dmFields |= DM_DUPLEX;
         }
         devMode->dmDuplex = duplex;
         devMode->dmFields |= DM_DUPLEX;

-        
+

         //// Quality
         //// Quality

-        
+

         int quality;
         switch (m_printQuality)
         {
         int quality;
         switch (m_printQuality)
         {


@@ -355,14 +428,14 @@ void wxPrintData::ConvertToNative()
         }
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;
         }
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;

-        
+

         GlobalUnlock(hDevMode);
     }
 }
 
 void wxPrintData::ConvertFromNative()
 {
         GlobalUnlock(hDevMode);
     }
 }
 
 void wxPrintData::ConvertFromNative()
 {

-    HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;

 
     if (!hDevMode)
         return;
 
     if (!hDevMode)
         return;


@@ -370,14 +443,17 @@ void wxPrintData::ConvertFromNative()
     if ( hDevMode )
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
     if ( hDevMode )
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);

-        
+
+#ifndef __WXWINE__

         //// Orientation
         //// Orientation

-        
+

         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;
         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;

-        
+#endif
+

         //// Collation
         //// Collation

-        
+
+#ifndef __WIN16__

         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)
         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)


@@ -385,16 +461,17 @@ void wxPrintData::ConvertFromNative()
             else
                 m_printCollate = FALSE;
         }
             else
                 m_printCollate = FALSE;
         }

-        
+#endif
+

         //// Number of copies
         //// Number of copies

-        
+

         if (devMode->dmFields & DM_COPIES)
         {
             m_printNoCopies = devMode->dmCopies;
         }
         if (devMode->dmFields & DM_COPIES)
         {
             m_printNoCopies = devMode->dmCopies;
         }

-        
+

         //// Printer name
         //// Printer name

-        
+

         if (devMode->dmDeviceName[0] != 0)
         {
             // TODO: make this Unicode compatible
         if (devMode->dmDeviceName[0] != 0)
         {
             // TODO: make this Unicode compatible


@@ -406,12 +483,12 @@ void wxPrintData::ConvertFromNative()
                 i ++;
             }
             buf[i] = 0;
                 i ++;
             }
             buf[i] = 0;

-            
+

             m_printerName = buf;
         }
             m_printerName = buf;
         }

-        
+

         //// Colour
         //// Colour

-        
+

         if (devMode->dmFields & DM_COLOR)
         {
             if (devMode->dmColor == DMCOLOR_COLOR)
         if (devMode->dmFields & DM_COLOR)
         {
             if (devMode->dmColor == DMCOLOR_COLOR)


@@ -421,9 +498,10 @@ void wxPrintData::ConvertFromNative()
         }
         else
             m_colour = TRUE;
         }
         else
             m_colour = TRUE;

-        
+
+#ifndef __WXWINE__

         //// Paper size
         //// Paper size

-        
+

         if (devMode->dmFields & DM_PAPERSIZE)
         {
             if (wxThePrintPaperDatabase)
         if (devMode->dmFields & DM_PAPERSIZE)
         {
             if (wxThePrintPaperDatabase)


@@ -438,8 +516,8 @@ void wxPrintData::ConvertFromNative()
                 else
                 {
                     // Shouldn't really get here
                 else
                 {
                     // Shouldn't really get here

-                    wxFAIL_MSG("Couldn't find paper size in paper database.");
-                    
+                    wxFAIL_MSG(_T("Couldn't find paper size in paper database."));
+

                     m_paperId = wxPAPER_NONE;
                     m_paperSize.x = 0;
                     m_paperSize.y = 0;
                     m_paperId = wxPAPER_NONE;
                     m_paperSize.x = 0;
                     m_paperSize.y = 0;


@@ -448,8 +526,8 @@ void wxPrintData::ConvertFromNative()
             else
             {
                 // Shouldn't really get here
             else
             {
                 // Shouldn't really get here

-                wxFAIL_MSG("Paper database wasn't initialized in wxPrintData::ConvertFromNative.");
-                
+                wxFAIL_MSG(_T("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
+

                 m_paperId = wxPAPER_NONE;
                 m_paperSize.x = 0;
                 m_paperSize.y = 0;
                 m_paperId = wxPAPER_NONE;
                 m_paperSize.x = 0;
                 m_paperSize.y = 0;


@@ -464,16 +542,16 @@ void wxPrintData::ConvertFromNative()
         else
         {
             // Shouldn't really get here
         else
         {
             // Shouldn't really get here

-            wxFAIL_MSG("Couldn't find paper size from DEVMODE.");
-            
+            wxFAIL_MSG(_T("Couldn't find paper size from DEVMODE."));
+

             m_paperSize.x = 0;
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }
             m_paperSize.x = 0;
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }

-        
-        
+#endif
+

         //// Duplex
         //// Duplex

-        
+

         if (devMode->dmFields & DM_DUPLEX)
         {
             switch (devMode->dmDuplex)
         if (devMode->dmFields & DM_DUPLEX)
         {
             switch (devMode->dmDuplex)


@@ -492,9 +570,9 @@ void wxPrintData::ConvertFromNative()
         }
         else
             m_duplexMode = wxDUPLEX_SIMPLEX;
         }
         else
             m_duplexMode = wxDUPLEX_SIMPLEX;

-        
+

         //// Quality
         //// Quality

-        
+

         if (devMode->dmFields & DM_PRINTQUALITY)
         {
             switch (devMode->dmPrintQuality)
         if (devMode->dmFields & DM_PRINTQUALITY)
         {
             switch (devMode->dmPrintQuality)


@@ -517,13 +595,13 @@ void wxPrintData::ConvertFromNative()
                     // will the application know if it's high, low, draft etc.??
                     //                    wxFAIL_MSG("Warning: DM_PRINTQUALITY was not one of the standard values.");
                     m_printQuality = devMode->dmPrintQuality; break;
                     // will the application know if it's high, low, draft etc.??
                     //                    wxFAIL_MSG("Warning: DM_PRINTQUALITY was not one of the standard values.");
                     m_printQuality = devMode->dmPrintQuality; break;

-                    
+

                 }
             }
         }
         else
             m_printQuality = wxPRINT_QUALITY_HIGH;
                 }
             }
         }
         else
             m_printQuality = wxPRINT_QUALITY_HIGH;

-        
+

         GlobalUnlock(hDevMode);
     }
 }
         GlobalUnlock(hDevMode);
     }
 }


@@ -556,7 +634,7 @@ void wxPrintData::operator=(const wxPrintData& data)
 }
 
 // For compatibility
 }
 
 // For compatibility

-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#if wxCOMPATIBILITY_WITH_PRINTSETUPDATA

 void wxPrintData::operator=(const wxPrintSetupData& setupData)
 {
     SetPrinterCommand(setupData.GetPrinterCommand());
 void wxPrintData::operator=(const wxPrintSetupData& setupData)
 {
     SetPrinterCommand(setupData.GetPrinterCommand());


@@ -579,12 +657,12 @@ void wxPrintData::operator=(const wxPrintSetupData& setupData)
     SetColour(setupData.GetColour());
     SetFilename(setupData.GetPrinterFile());
 }
     SetColour(setupData.GetColour());
     SetFilename(setupData.GetPrinterFile());
 }

-#endif
-    
+#endif // wxCOMPATIBILITY_WITH_PRINTSETUPDATA

 
 

-/*
- * Print dialog data
- */
+
+// ----------------------------------------------------------------------------
+// Print dialog data
+// ----------------------------------------------------------------------------

 
 wxPrintDialogData::wxPrintDialogData()
 {
 
 wxPrintDialogData::wxPrintDialogData()
 {


@@ -599,6 +677,7 @@ wxPrintDialogData::wxPrintDialogData()
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;

+    m_printSelection = FALSE;

     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;
     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;


@@ -624,6 +703,7 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;

+    m_printSelection = FALSE;

     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;
     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;


@@ -660,8 +740,8 @@ void wxPrintDialogData::ConvertToNative()
 #ifdef __GNUWIN32__
         pd->lStructSize    = 66 ;
 #else
 #ifdef __GNUWIN32__
         pd->lStructSize    = 66 ;
 #else

-#endif

         pd->lStructSize    = sizeof(PRINTDLG);
         pd->lStructSize    = sizeof(PRINTDLG);

+#endif

         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto
         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto


@@ -677,11 +757,11 @@ void wxPrintDialogData::ConvertToNative()
         GlobalFree(pd->hDevMode);
     }
 
         GlobalFree(pd->hDevMode);
     }
 

-    pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
+    pd->hDevMode = (HGLOBAL)(DWORD) m_printData.GetNativeData();

 
     m_printData.SetNativeData((void*) NULL);
 
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), "hDevMode must be non-NULL in ConvertToNative!");
+    wxASSERT_MSG( (pd->hDevMode), _T("hDevMode must be non-NULL in ConvertToNative!"));

 
     pd->hDC = (HDC) NULL;
     pd->nFromPage = (UINT)m_printFromPage;
 
     pd->hDC = (HDC) NULL;
     pd->nFromPage = (UINT)m_printFromPage;


@@ -689,7 +769,7 @@ void wxPrintDialogData::ConvertToNative()
     pd->nMinPage = (UINT)m_printMinPage;
     pd->nMaxPage = (UINT)m_printMaxPage;
     pd->nCopies = (UINT)m_printNoCopies;
     pd->nMinPage = (UINT)m_printMinPage;
     pd->nMaxPage = (UINT)m_printMaxPage;
     pd->nCopies = (UINT)m_printNoCopies;

-    
+

     pd->Flags = PD_RETURNDC ;
 
 #ifdef __GNUWIN32__
     pd->Flags = PD_RETURNDC ;
 
 #ifdef __GNUWIN32__


@@ -708,9 +788,11 @@ void wxPrintDialogData::ConvertToNative()
     pd->lpSetupTemplateName = NULL;
     pd->hPrintTemplate = (HGLOBAL) NULL;
     pd->hSetupTemplate = (HGLOBAL) NULL;
     pd->lpSetupTemplateName = NULL;
     pd->hPrintTemplate = (HGLOBAL) NULL;
     pd->hSetupTemplate = (HGLOBAL) NULL;

-    
+

     if ( m_printAllPages )
         pd->Flags |= PD_ALLPAGES;
     if ( m_printAllPages )
         pd->Flags |= PD_ALLPAGES;

+    if ( m_printAllPages )
+        pd->Flags |= PD_SELECTION;

     if ( m_printCollate )
         pd->Flags |= PD_COLLATE;
     if ( m_printToFile )
     if ( m_printCollate )
         pd->Flags |= PD_COLLATE;
     if ( m_printToFile )


@@ -739,9 +821,9 @@ void wxPrintDialogData::ConvertFromNative()
         if (m_printData.GetNativeData())
         {
             // Make sure we don't leak memory
         if (m_printData.GetNativeData())
         {
             // Make sure we don't leak memory

-            GlobalFree((HGLOBAL) m_printData.GetNativeData());
+            GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeData());

         }
         }

-        m_printData.SetNativeData((void*) pd->hDevMode);
+        m_printData.SetNativeData((void*)(long) pd->hDevMode);

         pd->hDevMode = NULL;
     }
 
         pd->hDevMode = NULL;
     }
 


@@ -754,8 +836,9 @@ void wxPrintDialogData::ConvertFromNative()
     m_printMinPage = pd->nMinPage ;
     m_printMaxPage = pd->nMaxPage ;
     m_printNoCopies = pd->nCopies ;
     m_printMinPage = pd->nMinPage ;
     m_printMaxPage = pd->nMaxPage ;
     m_printNoCopies = pd->nCopies ;

-    
+

     m_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);
     m_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);

+    m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);

     m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
     m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);
     m_printEnablePrintToFile = ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE);
     m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
     m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);
     m_printEnablePrintToFile = ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE);


@@ -773,7 +856,7 @@ void wxPrintDialogData::ConvertFromNative()
             m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
             wxString devName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
             GlobalUnlock(pd->hDevNames);
             m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
             wxString devName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
             GlobalUnlock(pd->hDevNames);

-            
+

 //            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
         }
     }
 //            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
         }
     }


@@ -784,14 +867,14 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
 {
     if ( m_printDlgData == NULL )
         ConvertToNative();
 {
     if ( m_printDlgData == NULL )
         ConvertToNative();

-    
+

     if ( m_printDlgData != NULL && win != NULL)
     {
         PRINTDLG *pd = (PRINTDLG *) m_printDlgData ;
         pd->hwndOwner=(HWND) win->GetHWND();
     }
 }
     if ( m_printDlgData != NULL && win != NULL)
     {
         PRINTDLG *pd = (PRINTDLG *) m_printDlgData ;
         pd->hwndOwner=(HWND) win->GetHWND();
     }
 }

-#endif
+#endif // MSW

 
 void wxPrintDialogData::operator=(const wxPrintDialogData& data)
 {
 
 void wxPrintDialogData::operator=(const wxPrintDialogData& data)
 {


@@ -803,6 +886,7 @@ void wxPrintDialogData::operator=(const wxPrintDialogData& data)
     m_printAllPages = data.m_printAllPages;
     m_printCollate = data.m_printCollate;
     m_printToFile = data.m_printToFile;
     m_printAllPages = data.m_printAllPages;
     m_printCollate = data.m_printCollate;
     m_printToFile = data.m_printToFile;

+    m_printSelection = data.m_printSelection;

     m_printEnableSelection = data.m_printEnableSelection;
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
     m_printEnableSelection = data.m_printEnableSelection;
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;


@@ -817,9 +901,9 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
     m_printData = data;
 }
 
     m_printData = data;
 }
 

-/*
- * wxPageSetupDialogData
- */
+// ----------------------------------------------------------------------------
+// wxPageSetupDialogData
+// ----------------------------------------------------------------------------

 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {


@@ -911,7 +995,7 @@ void wxPageSetupDialogData::operator=(const wxPrintData& data)
     m_printData = data;
 }
 
     m_printData = data;
 }
 

-#if defined(__WXMSW__) && defined(__WIN95__)
+#if defined(__WIN95__)

 void wxPageSetupDialogData::ConvertToNative()
 {
     m_printData.ConvertToNative();
 void wxPageSetupDialogData::ConvertToNative()
 {
     m_printData.ConvertToNative();


@@ -935,17 +1019,16 @@ void wxPageSetupDialogData::ConvertToNative()
         pd->hDevMode = NULL;
     }
 
         pd->hDevMode = NULL;
     }
 

-

     pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
 
     m_printData.SetNativeData((void*) NULL);
 
     pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), "hDevMode must be non-NULL in ConvertToNative!");
+    wxASSERT_MSG( (pd->hDevMode), _T("hDevMode must be non-NULL in ConvertToNative!"));

 
 //        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
 
     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
 
 //        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
 
     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;

-    
+

     if ( m_defaultMinMargins )
         pd->Flags |= PSD_DEFAULTMINMARGINS;
     if ( !m_enableMargins )
     if ( m_defaultMinMargins )
         pd->Flags |= PSD_DEFAULTMINMARGINS;
     if ( !m_enableMargins )


@@ -968,27 +1051,27 @@ void wxPageSetupDialogData::ConvertToNative()
     pd->hwndOwner=(HWND)NULL;
     pd->hDevNames=(HWND)NULL;
     pd->hInstance=(HINSTANCE)NULL;
     pd->hwndOwner=(HWND)NULL;
     pd->hDevNames=(HWND)NULL;
     pd->hInstance=(HINSTANCE)NULL;

-    
+

     pd->ptPaperSize.x = m_paperSize.x * 100;
     pd->ptPaperSize.y = m_paperSize.y * 100;
     pd->ptPaperSize.x = m_paperSize.x * 100;
     pd->ptPaperSize.y = m_paperSize.y * 100;

-    
+

     pd->rtMinMargin.left = m_minMarginTopLeft.x * 100;
     pd->rtMinMargin.top = m_minMarginTopLeft.y * 100;
     pd->rtMinMargin.right = m_minMarginBottomRight.x * 100;
     pd->rtMinMargin.bottom = m_minMarginBottomRight.y * 100;
     pd->rtMinMargin.left = m_minMarginTopLeft.x * 100;
     pd->rtMinMargin.top = m_minMarginTopLeft.y * 100;
     pd->rtMinMargin.right = m_minMarginBottomRight.x * 100;
     pd->rtMinMargin.bottom = m_minMarginBottomRight.y * 100;

-    
+

     pd->rtMargin.left = m_marginTopLeft.x * 100;
     pd->rtMargin.top = m_marginTopLeft.y * 100;
     pd->rtMargin.right = m_marginBottomRight.x * 100;
     pd->rtMargin.bottom = m_marginBottomRight.y * 100;
     pd->rtMargin.left = m_marginTopLeft.x * 100;
     pd->rtMargin.top = m_marginTopLeft.y * 100;
     pd->rtMargin.right = m_marginBottomRight.x * 100;
     pd->rtMargin.bottom = m_marginBottomRight.y * 100;

-    
+

     pd->lCustData = 0;
     pd->lpfnPageSetupHook = NULL;
     pd->lpfnPagePaintHook = NULL;
     pd->hPageSetupTemplate = NULL;
     pd->lpPageSetupTemplateName = NULL;
 
     pd->lCustData = 0;
     pd->lpfnPageSetupHook = NULL;
     pd->lpfnPagePaintHook = NULL;
     pd->hPageSetupTemplate = NULL;
     pd->lpPageSetupTemplateName = NULL;
 

-/*    
+/*

     if ( pd->hDevMode )
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);
     if ( pd->hDevMode )
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);


@@ -1006,7 +1089,7 @@ void wxPageSetupDialogData::ConvertFromNative()
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
     if ( !pd )
         return;
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
     if ( !pd )
         return;

-    
+

     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {
     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {


@@ -1022,7 +1105,7 @@ void wxPageSetupDialogData::ConvertFromNative()
     m_printData.ConvertFromNative();
 
     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
     m_printData.ConvertFromNative();
 
     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;

-    
+

     m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);
     m_enableMargins = ((pd->Flags & PSD_DISABLEMARGINS) != PSD_DISABLEMARGINS);
     m_enableOrientation = ((pd->Flags & PSD_DISABLEORIENTATION) != PSD_DISABLEORIENTATION);
     m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);
     m_enableMargins = ((pd->Flags & PSD_DISABLEMARGINS) != PSD_DISABLEMARGINS);
     m_enableOrientation = ((pd->Flags & PSD_DISABLEORIENTATION) != PSD_DISABLEORIENTATION);


@@ -1030,15 +1113,15 @@ void wxPageSetupDialogData::ConvertFromNative()
     m_enablePrinter = ((pd->Flags & PSD_DISABLEPRINTER) != PSD_DISABLEPRINTER);
     m_getDefaultInfo = ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT);
     m_enableHelp = ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP);
     m_enablePrinter = ((pd->Flags & PSD_DISABLEPRINTER) != PSD_DISABLEPRINTER);
     m_getDefaultInfo = ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT);
     m_enableHelp = ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP);

-    
+

     m_paperSize.x = pd->ptPaperSize.x / 100;
     m_paperSize.y = pd->ptPaperSize.y / 100;
     m_paperSize.x = pd->ptPaperSize.x / 100;
     m_paperSize.y = pd->ptPaperSize.y / 100;

-    
+

     m_minMarginTopLeft.x = pd->rtMinMargin.left / 100;
     m_minMarginTopLeft.y = pd->rtMinMargin.top / 100;
     m_minMarginBottomRight.x = pd->rtMinMargin.right / 100;
     m_minMarginBottomRight.y = pd->rtMinMargin.bottom / 100;
     m_minMarginTopLeft.x = pd->rtMinMargin.left / 100;
     m_minMarginTopLeft.y = pd->rtMinMargin.top / 100;
     m_minMarginBottomRight.x = pd->rtMinMargin.right / 100;
     m_minMarginBottomRight.y = pd->rtMinMargin.bottom / 100;

-    
+

     m_marginTopLeft.x = pd->rtMargin.left / 100 ;
     m_marginTopLeft.y = pd->rtMargin.top / 100 ;
     m_marginBottomRight.x = pd->rtMargin.right / 100 ;
     m_marginTopLeft.x = pd->rtMargin.left / 100 ;
     m_marginTopLeft.y = pd->rtMargin.top / 100 ;
     m_marginBottomRight.x = pd->rtMargin.right / 100 ;


@@ -1049,14 +1132,14 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 {
     if ( m_pageSetupData == NULL )
         ConvertToNative();
 {
     if ( m_pageSetupData == NULL )
         ConvertToNative();

-    
+

     if ( m_pageSetupData != NULL && win != NULL)
     {
         PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
         pd->hwndOwner=(HWND) win->GetHWND();
     }
 }
     if ( m_pageSetupData != NULL && win != NULL)
     {
         PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
         pd->hwndOwner=(HWND) win->GetHWND();
     }
 }

-#endif
+#endif // Win95

 
 // If a corresponding paper type is found in the paper database, will set the m_printData
 // paper size id member as well.
 
 // If a corresponding paper type is found in the paper database, will set the m_printData
 // paper size id member as well.


@@ -1079,7 +1162,9 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
 // paper id
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
 // paper id
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {

-    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL), "wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects." );
+    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+                  _T("wxThePrintPaperDatabase should not be NULL. "
+                     "Do not create global print dialog data objects.") );

 
     wxSize sz = GetPaperSize();
 
 
     wxSize sz = GetPaperSize();
 


@@ -1089,11 +1174,13 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
         m_printData.SetPaperId(id);
     }
 }
         m_printData.SetPaperId(id);
     }
 }

-    
+

 // Use paper id in wxPrintData to set this object's paper size
 void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
 // Use paper id in wxPrintData to set this object's paper size
 void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {

-    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL), "wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects." );
+    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+                  _T("wxThePrintPaperDatabase should not be NULL. "
+                     "Do not create global print dialog data objects.") );

 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 


@@ -1104,3 +1191,5 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
         m_paperSize.y = sz.y * 10;
     }
 }
         m_paperSize.y = sz.y * 10;
     }
 }

+
+#endif // wxUSE_PRINTING_ARCHITECTURE