added wxUmaskChanger class and wxCHANGE_UMASK macro and use them instead of duplicati...

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 7c646141cfbf5a2f56c84564370c60437e8c9f2b..c6208b0e8ce49c9dbb202a222f6e1f4b3eaad406 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -51,7 +51,7 @@
     #include <windowsx.h>
     #include "wx/msw/private.h"
 
     #include <windowsx.h>
     #include "wx/msw/private.h"
 

-    #ifndef __SMARTPHONE__
+    #ifndef __SMARTPHONE__ /* of WinCE */

         #include <commdlg.h>
     #endif
 
         #include <commdlg.h>
     #endif
 


@@ -490,7 +490,7 @@ void wxPrintData::ConvertToNative()
                 case wxPRINTBIN_MANUAL:         devMode->dmDefaultSource = DMBIN_MANUAL;        break;
                 case wxPRINTBIN_ENVELOPE:       devMode->dmDefaultSource = DMBIN_ENVELOPE;      break;
                 case wxPRINTBIN_ENVMANUAL:      devMode->dmDefaultSource = DMBIN_ENVMANUAL;     break;
                 case wxPRINTBIN_MANUAL:         devMode->dmDefaultSource = DMBIN_MANUAL;        break;
                 case wxPRINTBIN_ENVELOPE:       devMode->dmDefaultSource = DMBIN_ENVELOPE;      break;
                 case wxPRINTBIN_ENVMANUAL:      devMode->dmDefaultSource = DMBIN_ENVMANUAL;     break;

-                case wxPRINTBIN_AUTO:           devMode->dmDefaultSource = DMBIN_AUTO,;         break;
+                case wxPRINTBIN_AUTO:           devMode->dmDefaultSource = DMBIN_AUTO;          break;

                 case wxPRINTBIN_TRACTOR:        devMode->dmDefaultSource = DMBIN_TRACTOR;       break;
                 case wxPRINTBIN_SMALLFMT:       devMode->dmDefaultSource = DMBIN_SMALLFMT;      break;
                 case wxPRINTBIN_LARGEFMT:       devMode->dmDefaultSource = DMBIN_LARGEFMT;      break;
                 case wxPRINTBIN_TRACTOR:        devMode->dmDefaultSource = DMBIN_TRACTOR;       break;
                 case wxPRINTBIN_SMALLFMT:       devMode->dmDefaultSource = DMBIN_SMALLFMT;      break;
                 case wxPRINTBIN_LARGEFMT:       devMode->dmDefaultSource = DMBIN_LARGEFMT;      break;


@@ -554,7 +554,7 @@ void wxPrintData::ConvertFromNative()
 
         if (devMode->dmFields & DM_DEFAULTSOURCE)
         {
 
         if (devMode->dmFields & DM_DEFAULTSOURCE)
         {

-            m_bin = devMode->dmDefaultSource;
+            m_bin = (wxPrintBin)devMode->dmDefaultSource;

         }
 
         //// Printer name
         }
 
         //// Printer name