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

2
interface/wx/filename.h
View File

@@ -1271,7 +1271,7 @@ public:
@return @true on success, @false if an error occurred (for example,
the file doesn't exist).
*/
bool SetPermissions(int permissions)
bool SetPermissions(int permissions);
/**
Sets the file creation and last access/modification times (any of the pointers

2
interface/wx/graphics.h
View File

@@ -9,7 +9,7 @@
@class wxGraphicsPath
A wxGraphicsPath is a native representation of a geometric path. The
contents are specific an private to the respective renderer. Instances are
contents are specific and private to the respective renderer. Instances are
reference counted and can therefore be assigned as usual. The only way to
get a valid instance is by using wxGraphicsContext::CreatePath() or
wxGraphicsRenderer::CreatePath().

2
interface/wx/listctrl.h
View File

@@ -1372,7 +1372,7 @@ public:
/**
The data.
*/
long GetData() const;
wxUIntPtr GetData() const;
/**
The image.

4
interface/wx/menu.h
View File

@@ -433,8 +433,8 @@ public:
@note
Please note that @e wxID_ABOUT and @e wxID_EXIT are predefined by wxWidgets
and have a special meaning since entries using these IDs will be taken out
of the normal menus under MacOS X and will be inserted into the system menu
(following the appropriate MacOS X interface guideline).
of the normal menus under OS X and will be inserted into the system menu
(following the appropriate OS X interface guideline).
Menu items may be either @e normal items, @e check items or @e radio items.
Normal items don't have any special properties while the check items have a

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.