Cleaned up low level OS X sources.

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index d10484a938e117c22f427a77e8aa34b3c68fcceb..31348b791a723686905918a67a14491bf59641cf 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -159,7 +159,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
     {
         namedArgCount = 1;
         dispIds[1] = DISPID_PROPERTYPUT;
     {
         namedArgCount = 1;
         dispIds[1] = DISPID_PROPERTYPUT;

-        vReturnPtr = (VARIANTARG*) NULL;
+        vReturnPtr = NULL;

     }
 
     // Convert the wxVariants to VARIANTARGs
     }
 
     // Convert the wxVariants to VARIANTARGs


@@ -220,7 +220,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
             // Mustn't release the dispatch pointer
             if (vReturn.vt == VT_DISPATCH)
             {
             // Mustn't release the dispatch pointer
             if (vReturn.vt == VT_DISPATCH)
             {

-                vReturn.pdispVal = (IDispatch*) NULL;
+                vReturn.pdispVal = NULL;

             }
             ReleaseVariant(& vReturn);
         }
             }
             ReleaseVariant(& vReturn);
         }


@@ -440,7 +440,7 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
         }
     }
 
         }
     }
 

-    return (WXIDISPATCH*) NULL;
+    return NULL;

 }
 
 // Uses DISPATCH_PROPERTYGET
 }
 
 // Uses DISPATCH_PROPERTYGET


@@ -458,7 +458,7 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
         }
     }
 
         }
     }
 

-    return (WXIDISPATCH*) NULL;
+    return NULL;

 }
 
 
 }
 
 


@@ -731,7 +731,7 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
                 break;
 
             default:
                 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;
                            oleVariant.vt & VT_TYPEMASK);
                 variant = wxVariant();
                 ok = false;