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:
17
include/wx/qt/defs.h
Normal file
17
include/wx/qt/defs.h
Normal file
@@ -0,0 +1,17 @@
|
||||
/*
|
||||
* Name: wx/qt/defs.h
|
||||
* Author: Peter Most
|
||||
* Copyright: (c) Peter Most
|
||||
* Licence: wxWindows licence
|
||||
*/
|
||||
|
||||
#ifndef _WX_QT_DEFS_H_
|
||||
#define _WX_QT_DEFS_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
typedef class QWidget *WXWidget;
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* _WX_QT_DEFS_H_ */
|
Reference in New Issue
Block a user