Merge wxQT branch into the trunk.

This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-08-24 01:50:11 +00:00
parent d513d3e2f0
commit df13791078
381 changed files with 24333 additions and 938 deletions

View File

@@ -15,6 +15,8 @@
// Win32 only, is default (and only) on some other platforms
#define wxGA_SMOOTH 0x0020
// QT only, display current completed percentage (text default format "%p%")
#define wxGA_TEXT 0x0040
/**
@class wxGauge
@@ -43,6 +45,10 @@
@style{wxGA_SMOOTH}
Creates smooth progress bar with one pixel wide update step (not
supported by all platforms).
@style{wxGA_TEXT}
Display current completed percentage: text default format "%p%"
(only supported in wxQt, may be not available on all platforms).
@since 3.1.0
@endStyleTable
@library{wxcore}

View File

@@ -514,7 +514,7 @@ public:
Constructs a wxMenu object.
@param style
If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK only).
If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK and wxQT only).
*/
wxMenu(long style);
@@ -524,7 +524,7 @@ public:
@param title
Title at the top of the menu (not always supported).
@param style
If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK only).
If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK and wxQT only).
*/
wxMenu(const wxString& title, long style = 0);

View File

@@ -236,7 +236,7 @@ public:
Returns @true if the item is enabled or @false if it was disabled using
@ref Enable(unsigned int,bool) "Enable(n, false)".
This function is currently only implemented in wxMSW, wxGTK and
This function is currently only implemented in wxMSW, wxGTK, wxQT and
wxUniversal and always returns @true in the other ports.
@param n
@@ -251,7 +251,7 @@ public:
Note that this function returns @true for an item which hadn't been hidden
even if the entire radiobox is not currently shown.
This function is currently only implemented in wxMSW, wxGTK and
This function is currently only implemented in wxMSW, wxGTK, wxQT and
wxUniversal and always returns @true in the other ports.
@param n