Don't put wxMenu::MSWGetMenu() inside wxUSE_OWNER_DRAWN check.

This doesn't make any sense, this function is not related to the owner drawing
code at all and should always be available.

This corrects the changes of r70316, see #13851.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-12-05 22:18:07 +00:00
parent 0c61827188
commit c6cd1a305e
2 changed files with 3 additions and 7 deletions

View File

@@ -102,6 +102,9 @@ public:
wxAcceleratorTable *CreateAccelTable() const;
#endif // wxUSE_ACCEL
// get the menu with given handle (recursively)
wxMenu* MSWGetMenu(WXHMENU hMenu);
#if wxUSE_OWNER_DRAWN
int GetMaxAccelWidth()
@@ -116,9 +119,6 @@ public:
m_maxAccelWidth = -1;
}
// get the menu with given handle (recursively)
wxMenu* MSWGetMenu(WXHMENU hMenu);
private:
void CalculateMaxAccelWidth();