Implemented PocketPC menubar/toolbar as wxToolMenuBar derived
from wxToolBar, solving the problem of how normal toolbars can co-exist with combined ones. Tidied up WinCE toolbar code. Implemented wxToolBar as 'dummy' toolbar under Smartphone. Dialogs now show an empty menubar to hide inactive one underneath. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -716,9 +716,13 @@ wxMenuBar::~wxMenuBar()
|
||||
{
|
||||
// In Windows CE (not .NET), the menubar is always associated
|
||||
// with a toolbar, which destroys the menu implicitly.
|
||||
#if defined(WINCE_WITHOUT_COMMANDBAR)
|
||||
#if defined(WINCE_WITHOUT_COMMANDBAR) && defined(__POCKETPC__)
|
||||
if (GetToolBar())
|
||||
GetToolBar()->SetMenuBar(NULL);
|
||||
{
|
||||
wxToolMenuBar* toolMenuBar = wxDynamicCast(GetToolBar(), wxToolMenuBar);
|
||||
if (toolMenuBar)
|
||||
toolMenuBar->SetMenuBar(NULL);
|
||||
}
|
||||
#else
|
||||
// we should free Windows resources only if Windows doesn't do it for us
|
||||
// which happens if we're attached to a frame
|
||||
|
Reference in New Issue
Block a user