Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge the changes from 3.0 branch.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-11-12 18:06:37 +00:00
parent e4d0bc4bb1
commit 9b31387508
100 changed files with 7289 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
interface/wx/msw/ole/automtn.h
View File

@@ -610,7 +610,7 @@ public:
/**
Returns the flags used for conversions between wxVariant and OLE
VARIANT, see wxConvertVariantToOleFlags.
VARIANT, see wxOleConvertVariantFlags.
The default value is wxOleConvertVariant_Default for compatibility but
it can be changed using SetConvertVariantFlags().
@@ -624,7 +624,7 @@ public:
/**
Sets the flags used for conversions between wxVariant and OLE VARIANT,
see wxConvertVariantToOleFlags.
see wxOleConvertVariantFlags.
The default value is wxOleConvertVariant_Default.