second merge of the 2.2 branch (RL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -435,13 +435,9 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
 		{
 			return (WXIDISPATCH*) retVariant.GetVoidPtr();
 		}
-		else
-		{
-			return (WXIDISPATCH*) NULL;
-		}
 	}
-	else
-		return (WXIDISPATCH*) NULL;
+
+	return (WXIDISPATCH*) NULL;
 }

 // A way of initialising another wxAutomationObject with a dispatch object