diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-30 13:42:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-30 13:46:15 +0000 |
| commit | 06d8a9d436d39b56b27757312ad802021f9e6737 (patch) | |
| tree | 4f082b4d5110b2772bb9e3943c4c3d48259bd096 /include/vcl/builder.hxx | |
| parent | gbuild-to-ide: fix VimIntegrationGenerator (diff) | |
| download | core-06d8a9d436d39b56b27757312ad802021f9e6737.tar.gz core-06d8a9d436d39b56b27757312ad802021f9e6737.zip | |
support accelerator modifiers in menu builder
Change-Id: I39c4260ecec288be61f4f2c42c5b7c72babdb7a8
Diffstat (limited to 'include/vcl/builder.hxx')
| -rw-r--r-- | include/vcl/builder.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index e849ee5de40f..057737294924 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -49,6 +49,7 @@ class VCL_DLLPUBLIC VclBuilder { public: typedef std::map<OString, OString> stringmap; + typedef std::map<OString, std::pair<OString, OString>> accelmap; /// These functions create a new widget with parent pParent and return it in rRet typedef void (*customMakeWidget)(VclPtr<vcl::Window> &rRet, VclPtr<vcl::Window> &pParent, stringmap &rVec); @@ -361,14 +362,14 @@ private: void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec); static void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap); static void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap); - static void collectAccelerator(xmlreader::XmlReader &reader, stringmap &rMap); + static void collectAccelerator(xmlreader::XmlReader &reader, accelmap &rMap); void insertMenuObject( PopupMenu *pParent, const OString &rClass, const OString &rID, stringmap &rProps, - stringmap &rAccels); + accelmap &rAccels); void handleMenuChild(PopupMenu *pParent, xmlreader::XmlReader &reader); void handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &reader); |