File wxqt-compile.diff of Package wxWidgets-3_2

Overview Repositories Revisions Requests Users Attributes Meta

File wxqt-compile.diff of Package wxWidgets-3_2 (Revision 2611729f73c9c57fcd1e897e0da947d3)

Currently displaying revision 2611729f73c9c57fcd1e897e0da947d3 , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-12-05 19:29:16.174123839 +0100

build: fix compile errors/warnings

./src/qt/accel.cpp: In member function 'QList<QShortcut*>
wxAcceleratorTable::ConvertShortcutTable(QWidget*) const':
./src/qt/accel.cpp:88:11: error: 'Node' is not a member of
'wxAccelList'

Change code to use full PIMPL so that wx headers do not depend on Qt at all
(this is the declared goal of wx).
---
 src/qt/accel.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: wxWidgets-3.1.1~2244/src/qt/accel.cpp
===================================================================
--- wxWidgets-3.1.1~2244.orig/src/qt/accel.cpp
+++ wxWidgets-3.1.1~2244/src/qt/accel.cpp
@@ -86,7 +86,7 @@ QList< QShortcut* > *wxAcceleratorTable:
 {   
     QList< QShortcut* > *qtList = new QList< QShortcut* >;
     
-    for ( wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext() )
+    for (wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext())
     {
         qtList->push_back(ConvertAccelerator( node->GetData(), parent ));
     }

Places

File wxqt-compile.diff of Package wxWidgets-3_2 (Revision 2611729f73c9c57fcd1e897e0da947d3)

Places