Don't use native MSW functions in wxString::CmpNoCase().

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index eb69bdb766f65076cab95364e530d68cd798877e..26a9a6785a3d64326bf88a09d041a4a915acd85b 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -27,6 +27,9 @@
 #include "wx/cmndata.h"
 
 #ifndef WX_PRECOMP
 #include "wx/cmndata.h"
 
 #ifndef WX_PRECOMP

+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW

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


@@ -35,6 +38,7 @@
     #include "wx/gdicmn.h"
 #endif
 
     #include "wx/gdicmn.h"
 #endif
 

+#include "wx/tokenzr.h"

 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 


@@ -43,26 +47,18 @@
 #endif // wxUSE_FONTDLG
 
 #if wxUSE_PRINTING_ARCHITECTURE
 #endif // wxUSE_FONTDLG
 
 #if wxUSE_PRINTING_ARCHITECTURE

-    #include "wx/paper.h"
-#endif // wxUSE_PRINTING_ARCHITECTURE

 
 

-#if defined(__WXMSW__)
-    #include "wx/msw/wrapcdlg.h"
-#endif // MSW
+#include "wx/paper.h"

 
 

-    #if wxUSE_PRINTING_ARCHITECTURE

 
 

-#if defined(__WXMAC__)
-    #include "wx/mac/private/print.h"
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)

 
 

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

 
 

-    IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -80,7 +76,7 @@ wxColourData::wxColourData()
 }
 
 wxColourData::wxColourData(const wxColourData& data)
 }
 
 wxColourData::wxColourData(const wxColourData& data)

-    : wxObject()
+            : wxObject()

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


@@ -91,27 +87,68 @@ wxColourData::~wxColourData()
 
 void wxColourData::SetCustomColour(int i, const wxColour& colour)
 {
 
 void wxColourData::SetCustomColour(int i, const wxColour& colour)
 {

-    wxCHECK_RET( (i >= 0 && i < 16), _T("custom colour index out of range") );
+    wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, wxT("custom colour index out of range") );

 
     m_custColours[i] = colour;
 }
 
 
     m_custColours[i] = colour;
 }
 

-wxColour wxColourData::GetCustomColour(int i)
+wxColour wxColourData::GetCustomColour(int i) const

 {
 {

-    wxCHECK_MSG( (i >= 0 && i < 16), wxColour(0,0,0),
-                 _T("custom colour index out of range") );
+    wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0),
+                 wxT("custom colour index out of range") );

 
     return m_custColours[i];
 }
 
 
     return m_custColours[i];
 }
 

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

 {
 {

-    int i;
-    for (i = 0; i < 16; i++)
+    for ( int i = 0; i < NUM_CUSTOM; i++)

         m_custColours[i] = data.m_custColours[i];
 
         m_custColours[i] = data.m_custColours[i];
 

-    m_dataColour = (wxColour&)data.m_dataColour;
+    m_dataColour = data.m_dataColour;

     m_chooseFull = data.m_chooseFull;
     m_chooseFull = data.m_chooseFull;

+
+    return *this;
+}
+
+// ----------------------------------------------------------------------------
+// [de]serialization
+// ----------------------------------------------------------------------------
+
+// separator used between different fields
+static const char wxCOL_DATA_SEP = ',';
+
+wxString wxColourData::ToString() const
+{
+    wxString str(m_chooseFull ? '1' : '0');
+
+    for ( int i = 0; i < NUM_CUSTOM; i++ )
+    {
+        str += wxCOL_DATA_SEP;
+
+        const wxColour& clr = m_custColours[i];
+        if ( clr.IsOk() )
+            str += clr.GetAsString(wxC2S_HTML_SYNTAX);
+    }
+
+    return str;
+}
+
+bool wxColourData::FromString(const wxString& str)
+{
+    wxStringTokenizer tokenizer(str, wxCOL_DATA_SEP);
+    wxString token = tokenizer.GetNextToken();
+    m_chooseFull = token == '1';
+    bool success = m_chooseFull || token == '0';
+    for (int i = 0; success && i < NUM_CUSTOM; i++)
+    {
+        token = tokenizer.GetNextToken();
+        if (token.empty())
+            m_custColours[i] = wxNullColour;
+        else
+            success = m_custColours[i].Set(token);
+    }
+    return success;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -152,8 +189,10 @@ wxFontDialogBase::~wxFontDialogBase()
 wxPrintData::wxPrintData()
 {
     m_bin = wxPRINTBIN_DEFAULT;
 wxPrintData::wxPrintData()
 {
     m_bin = wxPRINTBIN_DEFAULT;

+    m_media = wxPRINTMEDIA_DEFAULT;

     m_printMode = wxPRINT_MODE_PRINTER;
     m_printOrientation = wxPORTRAIT;
     m_printMode = wxPRINT_MODE_PRINTER;
     m_printOrientation = wxPORTRAIT;

+    m_printOrientationReversed = false;

     m_printNoCopies = 1;
     m_printCollate = false;
 
     m_printNoCopies = 1;
     m_printCollate = false;
 


@@ -162,8 +201,11 @@ wxPrintData::wxPrintData()
     m_colour = true;
     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;
     m_colour = true;
     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;

-    m_paperId = wxPAPER_A4;
-    m_paperSize = wxSize(210, 297);
+
+    // we intentionally don't initialize paper id and size at all, like this
+    // the default system settings will be used for them
+    m_paperId = wxPAPER_NONE;
+    m_paperSize = wxDefaultSize;

 
     m_privData = NULL;
     m_privDataLen = 0;
 
     m_privData = NULL;
     m_privDataLen = 0;


@@ -181,11 +223,7 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
 
 void wxPrintData::SetPrivData( char *privData, int len )
 {
 
 void wxPrintData::SetPrivData( char *privData, int len )
 {

-    if (m_privData)
-    {
-        delete [] m_privData;
-        m_privData = NULL;
-    }
+    wxDELETEA(m_privData);

     m_privDataLen = len;
     if (m_privDataLen > 0)
     {
     m_privDataLen = len;
     if (m_privDataLen > 0)
     {


@@ -214,11 +252,15 @@ void wxPrintData::ConvertFromNative()
     m_nativeData->TransferTo( *this ) ;
 }
 
     m_nativeData->TransferTo( *this ) ;
 }
 

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

 {
 {

+    if ( &data == this )
+        return *this;
+

     m_printNoCopies = data.m_printNoCopies;
     m_printCollate = data.m_printCollate;
     m_printOrientation = data.m_printOrientation;
     m_printNoCopies = data.m_printNoCopies;
     m_printCollate = data.m_printCollate;
     m_printOrientation = data.m_printOrientation;

+    m_printOrientationReversed = data.m_printOrientationReversed;

     m_printerName = data.m_printerName;
     m_colour = data.m_colour;
     m_duplexMode = data.m_duplexMode;
     m_printerName = data.m_printerName;
     m_colour = data.m_colour;
     m_duplexMode = data.m_duplexMode;


@@ -226,6 +268,7 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_paperId = data.m_paperId;
     m_paperSize = data.m_paperSize;
     m_bin = data.m_bin;
     m_paperId = data.m_paperId;
     m_paperSize = data.m_paperSize;
     m_bin = data.m_bin;

+    m_media = data.m_media;

     m_printMode = data.m_printMode;
     m_filename = data.m_filename;
 
     m_printMode = data.m_printMode;
     m_filename = data.m_filename;
 


@@ -240,192 +283,25 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_nativeData = data.GetNativeData();
     m_nativeData->m_ref++;
 
     m_nativeData = data.GetNativeData();
     m_nativeData->m_ref++;
 

-    if (m_privData)
-    {
-        delete [] m_privData;
-        m_privData = NULL;
-    }
+    wxDELETEA(m_privData);

     m_privDataLen = data.GetPrivDataLen();
     if (m_privDataLen > 0)
     {
         m_privData = new char[m_privDataLen];
         memcpy( m_privData, data.GetPrivData(), m_privDataLen );
     }
     m_privDataLen = data.GetPrivDataLen();
     if (m_privDataLen > 0)
     {
         m_privData = new char[m_privDataLen];
         memcpy( m_privData, data.GetPrivData(), m_privDataLen );
     }

+
+    return *this;

 }
 
 // Is this data OK for showing the print dialog?
 }
 
 // Is this data OK for showing the print dialog?

-bool wxPrintData::Ok() const
+bool wxPrintData::IsOk() const

 {
     m_nativeData->TransferFrom( *this );
 
     return m_nativeData->Ok();
 }
 
 {
     m_nativeData->TransferFrom( *this );
 
     return m_nativeData->Ok();
 }
 

-// What should happen here?  wxPostScriptPrintNativeData is not
-// defined unless all this is true on MSW.
-#if WXWIN_COMPATIBILITY_2_4 && wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
-
-#include "wx/generic/prntdlgg.h"
-
-#if wxUSE_POSTSCRIPT
-    #define WXUNUSED_WITHOUT_PS(name) name
-#else
-    #define WXUNUSED_WITHOUT_PS(name) WXUNUSED(name)
-#endif
-
-wxString wxPrintData::GetPrinterCommand() const
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterCommand();
-#endif
-    return wxEmptyString;
-}
-
-wxString wxPrintData::GetPrinterOptions() const
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterOptions();
-#endif
-    return wxEmptyString;
-}
-
-wxString wxPrintData::GetPreviewCommand() const
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPreviewCommand();
-#endif
-    return wxEmptyString;
-}
-
-wxString wxPrintData::GetFontMetricPath() const
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetFontMetricPath();
-#endif
-    return wxEmptyString;
-}
-
-double wxPrintData::GetPrinterScaleX() const
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleX();
-#endif
-    return 1.0;
-}
-
-double wxPrintData::GetPrinterScaleY() const
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleY();
-#endif
-    return 1.0;
-}
-
-long wxPrintData::GetPrinterTranslateX() const
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateX();
-#endif
-    return 0;
-}
-
-long wxPrintData::GetPrinterTranslateY() const
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateY();
-#endif
-    return 0;
-}
-
-void wxPrintData::SetPrinterCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterCommand( command );
-#endif
-}
-
-void wxPrintData::SetPrinterOptions(const wxString& WXUNUSED_WITHOUT_PS(options))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterOptions( options );
-#endif
-}
-
-void wxPrintData::SetPreviewCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPreviewCommand( command );
-#endif
-}
-
-void wxPrintData::SetFontMetricPath(const wxString& WXUNUSED_WITHOUT_PS(path))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetFontMetricPath( path );
-#endif
-}
-
-void wxPrintData::SetPrinterScaleX(double WXUNUSED_WITHOUT_PS(x))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleX( x );
-#endif
-}
-
-void wxPrintData::SetPrinterScaleY(double WXUNUSED_WITHOUT_PS(y))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleY( y );
-#endif
-}
-
-void wxPrintData::SetPrinterScaling(double WXUNUSED_WITHOUT_PS(x), double WXUNUSED_WITHOUT_PS(y))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaling( x, y );
-#endif
-}
-
-void wxPrintData::SetPrinterTranslateX(long WXUNUSED_WITHOUT_PS(x))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateX( x );
-#endif
-}
-
-void wxPrintData::SetPrinterTranslateY(long WXUNUSED_WITHOUT_PS(y))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateY( y );
-#endif
-}
-
-void wxPrintData::SetPrinterTranslation(long WXUNUSED_WITHOUT_PS(x), long WXUNUSED_WITHOUT_PS(y))
-{
-#if wxUSE_POSTSCRIPT
-    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
-        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslation( x, y );
-#endif
-}
-#endif
-

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


@@ -448,9 +324,6 @@ wxPrintDialogData::wxPrintDialogData()
     m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
 
     m_printEnableHelp = false;
     m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
 
     m_printEnableHelp = false;

-#if WXWIN_COMPATIBILITY_2_4
-    m_printSetupDialog = false;
-#endif

 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)


@@ -466,7 +339,12 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
     m_printMinPage = 1;
     m_printMaxPage = 9999;
     m_printNoCopies = 1;
     m_printMinPage = 1;
     m_printMaxPage = 9999;
     m_printNoCopies = 1;

+    // On Mac the Print dialog always defaults to "All Pages"
+#ifdef __WXMAC__
+    m_printAllPages = true;
+#else

     m_printAllPages = false;
     m_printAllPages = false;

+#endif

     m_printCollate = false;
     m_printToFile = false;
     m_printSelection = false;
     m_printCollate = false;
     m_printToFile = false;
     m_printSelection = false;


@@ -474,9 +352,6 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
     m_printEnablePageNumbers = true;
     m_printEnablePrintToFile = true;
     m_printEnableHelp = false;
     m_printEnablePageNumbers = true;
     m_printEnablePrintToFile = true;
     m_printEnableHelp = false;

-#if WXWIN_COMPATIBILITY_2_4
-    m_printSetupDialog = false;
-#endif

     m_printData = printData;
 }
 
     m_printData = printData;
 }
 


@@ -499,9 +374,6 @@ void wxPrintDialogData::operator=(const wxPrintDialogData& data)
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
     m_printEnablePrintToFile = data.m_printEnablePrintToFile;
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
     m_printEnablePrintToFile = data.m_printEnablePrintToFile;

-#if WXWIN_COMPATIBILITY_2_4
-    m_printSetupDialog = data.m_printSetupDialog;
-#endif

     m_printData = data.m_printData;
 }
 
     m_printData = data.m_printData;
 }
 


@@ -624,7 +496,7 @@ void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
 // paper id
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
 // paper id
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {

-    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+    wxASSERT_MSG( (wxThePrintPaperDatabase != NULL),

                   wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
 
     wxSize sz = GetPaperSize();
                   wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
 
     wxSize sz = GetPaperSize();


@@ -639,14 +511,17 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
 // 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),
+    wxASSERT_MSG( (wxThePrintPaperDatabase != NULL),

                   wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
                   wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 

-    // 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;
+    if (sz != wxSize(0, 0))
+    {
+        // 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