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:
30
include/wx/qt/private/utils.h
Normal file
30
include/wx/qt/private/utils.h
Normal file
@@ -0,0 +1,30 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/qt/utils.h
|
||||
// Purpose: utility classes and/or functions
|
||||
// Author: Peter Most, Javier Torres
|
||||
// Created: 15/05/10
|
||||
// Copyright: (c) Peter Most, Javier Torres
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_QT_UTILS_H_
|
||||
#define _WX_QT_UTILS_H_
|
||||
|
||||
#include "wx/mousestate.h"
|
||||
#include <QtCore/Qt>
|
||||
|
||||
void wxQtFillMouseButtons( Qt::MouseButtons buttons, wxMouseState *state );
|
||||
|
||||
void wxMissingImplementation( const char fileName[], unsigned lineNumber,
|
||||
const char feature[] );
|
||||
|
||||
#define wxMISSING_IMPLEMENTATION( feature )\
|
||||
wxMissingImplementation( __FILE__, __LINE__, feature )
|
||||
|
||||
#define wxMISSING_FUNCTION() \
|
||||
wxMISSING_IMPLEMENTATION( __WXFUNCTION__ )
|
||||
|
||||
// global function handle Qt objects destruction (just for debugging now)
|
||||
void wxQtHandleDestroyedSignal(QObject *qobj = 0);
|
||||
|
||||
#endif // _WX_QT_UTILS_H_
|
Reference in New Issue
Block a user