include jconfig.vc under OS/2 too

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index d5d1725835eb8a5638a4995199c86f2e2db63f1e..0a80f775cb8347daf9aa7bd3deff6c8a9bd4a360 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -54,7 +54,7 @@
 
 #if wxUSE_DATETIME
 #include "wx/datetime.h"
 
 #if wxUSE_DATETIME
 #include "wx/datetime.h"

-#endif // wxUSE_TIMEDATE
+#endif // wxUSE_DATETIME

 
 static void ClearVariant(VARIANTARG *pvarg) ;
 static void ReleaseVariant(VARIANTARG *pvarg) ;
 
 static void ClearVariant(VARIANTARG *pvarg) ;
 static void ReleaseVariant(VARIANTARG *pvarg) ;


@@ -498,7 +498,7 @@ bool wxAutomationObject::GetInstance(const wxString& classId) const
     CLSID clsId;
     IUnknown * pUnk = NULL;
 
     CLSID clsId;
     IUnknown * pUnk = NULL;
 

-    wxBasicString unicodeName(classId.mb_str());
+    wxBasicString unicodeName(classId);

 
     if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
     {
 
     if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
     {


@@ -530,7 +530,7 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 
     CLSID clsId;
 
 
     CLSID clsId;
 

-    wxBasicString unicodeName(classId.mb_str());
+    wxBasicString unicodeName(classId);

 
     if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
     {
 
     if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
     {


@@ -688,7 +688,7 @@ WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant&
             unsigned short dosTime = 0;
             VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
 
             unsigned short dosTime = 0;
             VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
 

-            long dosDateTime = (dosDate << 16) || dosTime;
+            long dosDateTime = (dosDate << 16) | dosTime;

             wxDateTime date;
             date.SetFromDOS(dosDateTime);
             variant = date;
             wxDateTime date;
             date.SetFromDOS(dosDateTime);
             variant = date;