Fix discrepancy between different ways of measuring text extents under Mac.

[wxWidgets.git] / src / msw / ole / automtn.cpp

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 4580beea95552b75deb00e20c795454ba850a275..127b52b527d9626fca2c4af01e72b9064df5e5f4 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -606,11 +606,10 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
         wxDateTime date( variant.GetDateTime() );
         oleVariant.vt = VT_DATE;
 
-        long dosDateTime = date.GetAsDOS();
-        short dosDate = short((dosDateTime & 0xFFFF0000) >> 16);
-        short dosTime = short(dosDateTime & 0xFFFF);
+        SYSTEMTIME st;
+        date.GetAsMSWSysTime(&st);
 
-        DosDateTimeToVariantTime(dosDate, dosTime, & oleVariant.date);
+        SystemTimeToVariantTime(&st, &oleVariant.date);
     }
 #endif
     else if (type == wxT("void*"))
@@ -731,7 +730,7 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
                 break;
 
             default:
-                wxLogDebug(_T("unhandled VT_ARRAY type %x in wxConvertOleToVariant"),
+                wxLogDebug(wxT("unhandled VT_ARRAY type %x in wxConvertOleToVariant"),
                            oleVariant.vt & VT_TYPEMASK);
                 variant = wxVariant();
                 ok = false;
@@ -772,13 +771,11 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
             case VT_DATE:
 #if wxUSE_DATETIME
                 {
-                    unsigned short dosDate = 0;
-                    unsigned short dosTime = 0;
-                    VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
+                    SYSTEMTIME st;
+                    VariantTimeToSystemTime(oleVariant.date, &st);
 
-                    long dosDateTime = (dosDate << 16) | dosTime;
                     wxDateTime date;
-                    date.SetFromDOS(dosDateTime);
+                    date.SetFromMSWSysTime(st);
                     variant = date;
                 }
 #endif // wxUSE_DATETIME