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:
@@ -48,7 +48,7 @@ public:
|
||||
virtual wxFDIOManager *GetFDIOManager();
|
||||
#endif // wxUSE_SOCKETS
|
||||
|
||||
#if wxUSE_CONSOLE_EVENTLOOP
|
||||
#if wxUSE_EVENTLOOP_SOURCE
|
||||
// Return a non-NULL pointer to the object responsible for managing the
|
||||
// event loop sources in this kind of application.
|
||||
virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager();
|
||||
|
Reference in New Issue
Block a user