cocoa doesn't need system framework - string conversion for cocoa - focus for cocoa...

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index b3d61564b8b81ccb1e944f85529d04fc2266007b..07040ea1e8b803dd7dd3b81b1863534a5dc17392 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
 


@@ -293,16 +293,16 @@ static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& prin
             printerName.Length() + 1 +
                              portName.Length()+1 ) * sizeof(wxChar) );
         LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
             printerName.Length() + 1 +
                              portName.Length()+1 ) * sizeof(wxChar) );
         LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);

-        lpDev->wDriverOffset = sizeof(WORD)*4;
-        wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDriverOffset ), driverName);
+        lpDev->wDriverOffset = sizeof(WORD) * 4 / sizeof(wxChar);
+        wxStrcpy((wxChar*)lpDev + lpDev->wDriverOffset, driverName);

 
         lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset +
 
         lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset +

-                                       sizeof(wxChar) * ( driverName.Length() + 1 ) );
-        wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDeviceOffset ), printerName);
+                                       driverName.Length() + 1 );
+        wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);

 
         lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset +
 
         lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset +

-                                       sizeof(wxChar) * ( printerName.Length() + 1 ) );
-        wxStrcpy((wxChar*)((char*) lpDev + lpDev->wOutputOffset ), portName);
+                                       printerName.Length() + 1 );
+        wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);

 
         lpDev->wDefault = 0;
 
 
         lpDev->wDefault = 0;
 


@@ -383,7 +383,7 @@ void wxPrintData::ConvertToNative()
 
         //// Orientation
 
 
         //// Orientation
 

-        devMode->dmOrientation = m_printOrientation;
+        devMode->dmOrientation = (short)m_printOrientation;

 
         //// Collation
 
 
         //// Collation
 


@@ -392,7 +392,7 @@ void wxPrintData::ConvertToNative()
 
         //// Number of copies
 
 
         //// Number of copies
 

-        devMode->dmCopies = m_printNoCopies;
+        devMode->dmCopies = (short)m_printNoCopies;

         devMode->dmFields |= DM_COPIES;
 
         //// Printer name
         devMode->dmFields |= DM_COPIES;
 
         //// Printer name


@@ -418,8 +418,8 @@ void wxPrintData::ConvertToNative()
         if (m_paperId == wxPAPER_NONE)
         {
             // DEVMODE is in tenths of a milimeter
         if (m_paperId == wxPAPER_NONE)
         {
             // DEVMODE is in tenths of a milimeter

-            devMode->dmPaperWidth = m_paperSize.x * 10;
-            devMode->dmPaperLength = m_paperSize.y * 10;
+            devMode->dmPaperWidth = (short)(m_paperSize.x * 10);
+            devMode->dmPaperLength = (short)(m_paperSize.y * 10);

             devMode->dmPaperSize = DMPAPER_USER;
             devMode->dmFields |= DM_PAPERWIDTH;
             devMode->dmFields |= DM_PAPERLENGTH;
             devMode->dmPaperSize = DMPAPER_USER;
             devMode->dmFields |= DM_PAPERWIDTH;
             devMode->dmFields |= DM_PAPERLENGTH;


@@ -431,7 +431,7 @@ void wxPrintData::ConvertToNative()
                 wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(m_paperId);
                 if (paper)
                 {
                 wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(m_paperId);
                 if (paper)
                 {

-                    devMode->dmPaperSize = paper->GetPlatformId();
+                    devMode->dmPaperSize = (short)paper->GetPlatformId();

                     devMode->dmFields |= DM_PAPERSIZE;
                 }
             }
                     devMode->dmFields |= DM_PAPERSIZE;
                 }
             }


@@ -439,43 +439,43 @@ void wxPrintData::ConvertToNative()
 
         //// Duplex
 
 
         //// Duplex
 

-        int duplex;
+        short duplex;

         switch (m_duplexMode)
         {
         switch (m_duplexMode)
         {

-        case wxDUPLEX_HORIZONTAL: {
-            duplex = DMDUP_HORIZONTAL; break;
-                                  }
-        case wxDUPLEX_VERTICAL: {
-            duplex = DMDUP_VERTICAL; break;
-                                }
-        default:
-        case wxDUPLEX_SIMPLEX: {
-            duplex = DMDUP_SIMPLEX; break;
-                               }
+            case wxDUPLEX_HORIZONTAL:
+                duplex = DMDUP_HORIZONTAL;
+                break;
+            case wxDUPLEX_VERTICAL:
+                duplex = DMDUP_VERTICAL;
+                break;
+            default:
+            // in fact case wxDUPLEX_SIMPLEX:
+                duplex = DMDUP_SIMPLEX;
+                break;

         }
         devMode->dmDuplex = duplex;
         devMode->dmFields |= DM_DUPLEX;
 
         //// Quality
 
         }
         devMode->dmDuplex = duplex;
         devMode->dmFields |= DM_DUPLEX;
 
         //// Quality
 

-        int quality;
+        short quality;

         switch (m_printQuality)
         {
         switch (m_printQuality)
         {

-        case wxPRINT_QUALITY_MEDIUM: {
-            quality = DMRES_MEDIUM; break;
-                                     }
-        case wxPRINT_QUALITY_LOW: {
-            quality = DMRES_LOW; break;
-                                  }
-        case wxPRINT_QUALITY_DRAFT: {
-            quality = DMRES_DRAFT; break;
-                                    }
-        case wxPRINT_QUALITY_HIGH: {
-            quality = DMRES_HIGH; break;
-                                   }
-        default: {
-            quality = m_printQuality; break;
-                 }
+            case wxPRINT_QUALITY_MEDIUM:
+                quality = DMRES_MEDIUM;
+                break;
+            case wxPRINT_QUALITY_LOW:
+                quality = DMRES_LOW;
+                break;
+            case wxPRINT_QUALITY_DRAFT:
+                quality = DMRES_DRAFT;
+                break;
+            case wxPRINT_QUALITY_HIGH:
+                quality = DMRES_HIGH;
+                break;
+            default:
+                quality = (short)m_printQuality;
+                break;

         }
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;
         }
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;


@@ -499,7 +499,7 @@ void wxPrintData::ConvertToNative()
                 case wxPRINTBIN_FORMSOURCE:     devMode->dmDefaultSource = DMBIN_FORMSOURCE;    break;
 
                 default:
                 case wxPRINTBIN_FORMSOURCE:     devMode->dmDefaultSource = DMBIN_FORMSOURCE;    break;
 
                 default:

-                    devMode->dmDefaultSource = DMBIN_USER + m_bin - wxPRINTBIN_USER;
+                    devMode->dmDefaultSource = (short)(DMBIN_USER + m_bin - wxPRINTBIN_USER);

                     break;
             }
 
                     break;
             }