Correct alignment of menu accelerator strings in owner-drawn menus.
Draw them right-aligned as the native menus do. Closes #11479. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -91,6 +91,25 @@ public:
|
||||
wxAcceleratorTable *CreateAccelTable() const;
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
|
||||
int GetMaxAccelWidth()
|
||||
{
|
||||
if (m_maxAccelWidth == -1)
|
||||
CalculateMaxAccelWidth();
|
||||
return m_maxAccelWidth;
|
||||
}
|
||||
|
||||
void ResetMaxAccelWidth()
|
||||
{
|
||||
m_maxAccelWidth = -1;
|
||||
}
|
||||
|
||||
private:
|
||||
void CalculateMaxAccelWidth();
|
||||
|
||||
#endif // wxUSE_OWNER_DRAWN
|
||||
|
||||
protected:
|
||||
virtual wxMenuItem* DoAppend(wxMenuItem *item);
|
||||
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
|
||||
@@ -126,6 +145,9 @@ private:
|
||||
|
||||
// the max width of menu items bitmaps
|
||||
int m_maxBitmapWidth;
|
||||
|
||||
// the max width of menu items accels
|
||||
int m_maxAccelWidth;
|
||||
#endif // wxUSE_OWNER_DRAWN
|
||||
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu)
|
||||
|
Reference in New Issue
Block a user