diff --git a/include/wx/qt/menuitem.h b/include/wx/qt/menuitem.h index c173d4c6b1..d39e860d33 100644 --- a/include/wx/qt/menuitem.h +++ b/include/wx/qt/menuitem.h @@ -12,7 +12,6 @@ #include "wx/bitmap.h" class QAction; -class wxQtAction; class WXDLLIMPEXP_FWD_CORE wxMenu; @@ -48,7 +47,7 @@ public: private: // Qt is using an action instead of a menu item. - wxQtAction *m_qtAction; + QAction *m_qtAction; wxDECLARE_DYNAMIC_CLASS( wxMenuItem ); }; diff --git a/src/qt/menuitem.cpp b/src/qt/menuitem.cpp index 1a5aa7dc94..e6f8cd44bf 100644 --- a/src/qt/menuitem.cpp +++ b/src/qt/menuitem.cpp @@ -83,9 +83,10 @@ void wxMenuItem::SetItemLabel( const wxString &label ) wxMenuItemBase::SetItemLabel( qtlabel ); - m_qtAction->UpdateShortcutsFromLabel( qtlabel ); + auto qtAction = static_cast(m_qtAction); - m_qtAction->setText( wxQtConvertString( qtlabel )); + qtAction->UpdateShortcutsFromLabel( qtlabel ); + qtAction->setText( wxQtConvertString( qtlabel )); } @@ -171,14 +172,14 @@ void wxMenuItem::AddExtraAccel(const wxAcceleratorEntry& accel) { wxMenuItemBase::AddExtraAccel(accel); - m_qtAction->UpdateShortcuts( accel.ToRawString() ); + static_cast(m_qtAction)->UpdateShortcuts( accel.ToRawString() ); } void wxMenuItem::ClearExtraAccels() { wxMenuItemBase::ClearExtraAccels(); - m_qtAction->UpdateShortcuts( wxString() ); + static_cast(m_qtAction)->UpdateShortcuts( wxString() ); } #endif // wxUSE_ACCEL