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:
@@ -26,6 +26,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
|
||||
|
||||
// GTK and Mac always have native implementation of the indeterminate mode
|
||||
// wxMSW has native implementation only if comctl32.dll >= 6.00
|
||||
@@ -109,6 +111,8 @@ protected:
|
||||
#include "wx/gtk1/gauge.h"
|
||||
#elif defined(__WXMAC__)
|
||||
#include "wx/osx/gauge.h"
|
||||
#elif defined(__WXQT__)
|
||||
#include "wx/qt/gauge.h"
|
||||
#endif
|
||||
|
||||
#endif // wxUSE_GAUGE
|
||||
|
Reference in New Issue
Block a user