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:
62
include/wx/qt/accel.h
Normal file
62
include/wx/qt/accel.h
Normal file
@@ -0,0 +1,62 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/qt/accel.h
|
||||
// Purpose: wxAcceleratorTable class
|
||||
// Author: Peter Most, Javier Torres
|
||||
// Modified by:
|
||||
// Created: 09/08/09
|
||||
// Copyright: (c) Peter Most, Javier Torres
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_QT_ACCEL_H_
|
||||
#define _WX_QT_ACCEL_H_
|
||||
|
||||
#include <QtCore/QList>
|
||||
#include <QtWidgets/QShortcut>
|
||||
|
||||
/* wxQt accelerators implementation:
|
||||
*
|
||||
* Storing:
|
||||
* QShortcuts are stored in wxWindow (m_qtShortcuts) to allow to delete them
|
||||
* when the accelerator table is changed, and also because we need to specify
|
||||
* a not-null parent from them, which is unknown at the moment of creating the
|
||||
* accelerator table. So, the accelerator table only contains a list of
|
||||
* wxAcceleratorEntries, which are converted to a list of QShortcuts when
|
||||
* the table is fixed to a wxWindow.
|
||||
*
|
||||
* Passing keypresses to accelerators:
|
||||
* The accelerators are implemented using QShortcut's. As there is no easy way
|
||||
* to call them, we must pass all keypress events through the QApplication
|
||||
* notify() function (which is the one that checks if the keypress match any
|
||||
* shortcut.
|
||||
*
|
||||
* Executing commands when a QShortcut is triggered:
|
||||
* Each QShortcut has a property ("wxQt_Command") set with the number of the
|
||||
* wx command it is associated to. Then, its activated() signal is connected to
|
||||
* a small handler (wxQtShortcutHandler in window_qt.h) which calls the main
|
||||
* handler (wxWindow::QtHandleShortcut) passing the command extracted from the
|
||||
* QShortcut. This handler will finally create and send the appropriate wx
|
||||
* event to the window. */
|
||||
|
||||
class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
|
||||
{
|
||||
public:
|
||||
wxAcceleratorTable();
|
||||
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
|
||||
|
||||
// Implementation
|
||||
QList< QShortcut* > ConvertShortcutTable( QWidget *parent ) const;
|
||||
|
||||
bool Ok() const { return IsOk(); }
|
||||
bool IsOk() const;
|
||||
|
||||
protected:
|
||||
// ref counting code
|
||||
virtual wxObjectRefData *CreateRefData() const;
|
||||
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
|
||||
};
|
||||
|
||||
#endif // _WX_QT_ACCEL_H_
|
Reference in New Issue
Block a user