]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/cmndata.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
1. serious bug in wxRegConfig corrected - deleting a value would delete the
[wxWidgets.git] / src / common / cmndata.cpp
diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 872e8e4b6e232e9265e208bd14ba65c9bc0a1ead..b9c2c8fc0b2a7f6708d0dd450ee6ce59a03caa1d 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -37,17 +37,20 @@
 
 #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
     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 
-#if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-    #include "wx/generic/dcpsg.h"
-#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__
     #include <windows.h>
@@ -58,6 +61,11 @@
         #include <commdlg.h>
     #endif // Win16
 
+    #ifdef __WXWINE__
+        #include <cderr.h>
+        #include <commdlg.h>
+    #endif
+
     #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
         #include <windowsx.h>
         #include <commdlg.h>
@@ -65,9 +73,11 @@
 #endif // MSW
 
 #if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, 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
@@ -162,6 +172,7 @@ void wxFontData::operator=(const wxFontData& data)
     maxSize = data.maxSize;
 }
 
+#if wxUSE_PRINTING_ARCHITECTURE
 // ----------------------------------------------------------------------------
 // Print data
 // ----------------------------------------------------------------------------
@@ -214,42 +225,42 @@ wxPrintData::~wxPrintData()
 #endif
 }
 
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) // && defined(__WIN32__)
 
+#ifdef __WIN32__
 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();
-    wxString msg = "Unknown";
+    wxString msg = _T("Unknown");
     switch (err)
     {
-        case CDERR_FINDRESFAILURE: msg = "CDERR_FINDRESFAILURE"; break;
-        case CDERR_INITIALIZATION: msg = "CDERR_INITIALIZATION"; break;
-        case CDERR_LOADRESFAILURE: msg = "CDERR_LOADRESFAILURE"; break;
-        case CDERR_LOADSTRFAILURE: msg = "CDERR_LOADSTRFAILURE"; break;
-        case CDERR_LOCKRESFAILURE: msg = "CDERR_LOCKRESFAILURE"; break;
-        case CDERR_MEMALLOCFAILURE: msg = "CDERR_MEMALLOCFAILURE"; break;
-        case CDERR_MEMLOCKFAILURE: msg = "CDERR_MEMLOCKFAILURE"; break;
-        case CDERR_NOHINSTANCE: msg = "CDERR_NOHINSTANCE"; break;
-        case CDERR_NOHOOK: msg = "CDERR_NOHOOK"; break;
-        case CDERR_NOTEMPLATE: msg = "CDERR_NOTEMPLATE"; break;
-        case CDERR_STRUCTSIZE: msg = "CDERR_STRUCTSIZE"; break;
-        case  PDERR_RETDEFFAILURE: msg = "PDERR_RETDEFFAILURE"; break;
-        case  PDERR_PRINTERNOTFOUND: msg = "PDERR_PRINTERNOTFOUND"; break;
-        case  PDERR_PARSEFAILURE: msg = "PDERR_PARSEFAILURE"; break;
-        case  PDERR_NODEVICES: msg = "PDERR_NODEVICES"; break;
-        case  PDERR_NODEFAULTPRN: msg = "PDERR_NODEFAULTPRN"; break;
-        case  PDERR_LOADDRVFAILURE: msg = "PDERR_LOADDRVFAILURE"; break;
-        case  PDERR_INITFAILURE: msg = "PDERR_INITFAILURE"; break;
-        case  PDERR_GETDEVMODEFAIL: msg = "PDERR_GETDEVMODEFAIL"; break;
-        case  PDERR_DNDMMISMATCH: msg = "PDERR_DNDMMISMATCH"; break;
-        case  PDERR_DEFAULTDIFFERENT: msg = "PDERR_DEFAULTDIFFERENT"; break;
-        case  PDERR_CREATEICFAILURE: msg = "PDERR_CREATEICFAILURE"; break;
+        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()
 {
@@ -288,7 +299,7 @@ void wxPrintData::ConvertToNative()
             pd->hDevNames = NULL;
 
 #if defined(__WXDEBUG__) && defined(__WIN32__)
-            wxString str("Printing error: ");
+            wxString str(_T("Printing error: "));
             str += wxGetPrintDlgError();
             wxLogDebug(str);
 #endif
@@ -313,13 +324,17 @@ void wxPrintData::ConvertToNative()
 
         //// Orientation
 
+#ifndef __WXWINE__
         devMode->dmOrientation = m_printOrientation;
+#endif
         devMode->dmFields = DM_ORIENTATION;
 
         //// Collation
 
+#ifndef __WIN16__
         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;
+#endif
 
         //// Number of copies
 
@@ -328,7 +343,7 @@ void wxPrintData::ConvertToNative()
 
         //// Printer name
 
-        if (m_printerName != "")
+        if (m_printerName != _T(""))
         {
             // TODO: make this Unicode compatible
             int len = wxMin(31, m_printerName.Len());
@@ -347,6 +362,7 @@ void wxPrintData::ConvertToNative()
 
         devMode->dmFields |= DM_COLOR;
 
+#ifndef __WXWINE__
         //// Paper size
 
         if (m_paperId == wxPAPER_NONE)
@@ -368,6 +384,7 @@ void wxPrintData::ConvertToNative()
                 }
             }
         }
+#endif
 
         //// Duplex
 
@@ -427,13 +444,16 @@ void wxPrintData::ConvertFromNative()
     {
         DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
 
+#ifndef __WXWINE__
         //// Orientation
 
         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;
+#endif
 
         //// Collation
 
+#ifndef __WIN16__
         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)
@@ -441,6 +461,7 @@ void wxPrintData::ConvertFromNative()
             else
                 m_printCollate = FALSE;
         }
+#endif
 
         //// Number of copies
 
@@ -478,6 +499,7 @@ void wxPrintData::ConvertFromNative()
         else
             m_colour = TRUE;
 
+#ifndef __WXWINE__
         //// Paper size
 
         if (devMode->dmFields & DM_PAPERSIZE)
@@ -494,7 +516,7 @@ void wxPrintData::ConvertFromNative()
                 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;
@@ -504,7 +526,7 @@ void wxPrintData::ConvertFromNative()
             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;
@@ -520,13 +542,13 @@ void wxPrintData::ConvertFromNative()
         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;
         }
-
+#endif
 
         //// Duplex
 
@@ -716,8 +738,8 @@ void wxPrintDialogData::ConvertToNative()
 #ifdef __GNUWIN32__
         pd->lStructSize    = 66 ;
 #else
-#endif
         pd->lStructSize    = sizeof(PRINTDLG);
+#endif
         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto
@@ -737,7 +759,7 @@ void wxPrintDialogData::ConvertToNative()
 
     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;
@@ -996,7 +1018,7 @@ void wxPageSetupDialogData::ConvertToNative()
 
     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));
 
@@ -1136,8 +1158,8 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
-                  "wxThePrintPaperDatabase should not be NULL. "
-                  "Do not create global print dialog data objects." );
+                  _T("wxThePrintPaperDatabase should not be NULL. "
+                    "Do not create global print dialog data objects.") );
 
     wxSize sz = GetPaperSize();
 
@@ -1152,8 +1174,8 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
 void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
-                  "wxThePrintPaperDatabase should not be NULL. "
-                  "Do not create global print dialog data objects." );
+                  _T("wxThePrintPaperDatabase should not be NULL. "
+                    "Do not create global print dialog data objects.") );
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
@@ -1165,3 +1187,4 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
     }
 }
 
+#endif // wxUSE_PRINTING_ARCHITECTURE
wxWidgets (Impactor)