wxFrame::~wxFrame()
{
- m_isBeingDeleted = true;
+ SendDestroyEvent();
+
DeleteAllBars();
}
SetToolBar(toolBar);
menubar->SetToolBar(toolBar);
}
- // Now adjust size for menu bar
- int menuHeight = 26;
- //When the main window is created using CW_USEDEFAULT the height of the
- // is created is not taken into account). So we resize the window after
- // if a menubar is present
+ // When the main window is created using CW_USEDEFAULT the height of the
+ // menubar is not taken into account, so we resize it afterwards if a
+ // menubar is present
+ HWND hwndMenuBar = SHFindMenuBar(GetHwnd());
+ if ( hwndMenuBar )
{
+ RECT mbRect;
+ ::GetWindowRect(hwndMenuBar, &mbRect);
+ const int menuHeight = mbRect.bottom - mbRect.top;
+
RECT rc;
- ::GetWindowRect((HWND) GetHWND(), &rc);
+ ::GetWindowRect(GetHwnd(), &rc);
// adjust for menu / titlebar height
rc.bottom -= (2*menuHeight-1);
- ::MoveWindow((HWND) GetHWND(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
+ ::MoveWindow(Gethwnd(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
}
#endif
if ( !m_hMenu )
{
- wxFAIL_MSG( _T("failed to create menu bar") );
+ wxFAIL_MSG( wxT("failed to create menu bar") );
return;
}
}
#if wxUSE_MENUS
if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
{
- WXHMENU menu = m_hMenu;
-
-#if wxUSE_MDI_ARCHITECTURE
- wxMDIParentFrame *frame = wxDynamicCast(this, wxMDIParentFrame);
- if (frame)
- {
- wxMDIChildFrame *child = frame->GetActiveChild();
- if (child)
- {
- menu = child->GetWinMenu();
- }
- }
-#endif // wxUSE_MDI_ARCHITECTURE
-
- if (menu)
- {
- ::SetMenu(GetHwnd(), (HMENU)menu);
- }
+ const WXHMENU hmenu = MSWGetActiveMenu();
+ if ( hmenu )
+ ::SetMenu(GetHwnd(), (HMENU)hmenu);
}
#endif // wxUSE_MENUS
tx = 0;
}
- int desiredW = tw;
- int desiredH = th;
+ int desiredW,
+ desiredH;
if ( toolbar->IsVertical() )
{
+ desiredW = tw;
desiredH = height;
}
else
{
desiredW = width;
+ desiredH = th;
}
- // use the 'real' MSW position here, don't offset relativly to the
+ // use the 'real' MSW position here, don't offset relatively to the
// client area origin
-
- // Optimise such that we don't have to always resize the toolbar
- // when the frame changes, otherwise we'll get a lot of flicker.
- bool heightChanging wxDUMMY_INITIALIZE(true);
- bool widthChanging wxDUMMY_INITIALIZE(true);
-
- if ( toolbar->IsVertical() )
- {
- // It's OK if the current height is greater than what can be shown.
- heightChanging = (desiredH > th) ;
- widthChanging = (desiredW != tw) ;
-
- // The next time around, we may not have to set the size
- if (heightChanging)
- desiredH = desiredH + 200;
- }
- else
- {
- // It's OK if the current width is greater than what can be shown.
- widthChanging = (desiredW > tw) ;
- heightChanging = (desiredH != th) ;
-
- // The next time around, we may not have to set the size
- if (widthChanging)
- desiredW = desiredW + 200;
- }
-
- if (tx != 0 || ty != 0 || widthChanging || heightChanging)
- toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
+ toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
}
#endif // !WINCE_WITH_COMMANDBAR
return false;
}
-bool wxFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
+bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
{
+#if wxUSE_MENUS
+
+#if defined(WINCE_WITHOUT_COMMANDBAR)
+ if (GetToolBar() && GetToolBar()->FindById(id))
+ return GetToolBar()->MSWCommand(cmd, id);
+#endif
+
// we only need to handle the menu and accelerator commands from the items
// of our menu bar, base wxWindow class already handles the rest
if ( !control && (cmd == 0 /* menu */ || cmd == 1 /* accel */) )
if ( !wxCurrentPopupMenu )
#endif // wxUSE_MENUS_NATIVE
{
- wxMenuBar * const mbar = GetMenuBar();
- if ( mbar )
- {
- // sign extend to int from short before comparing with the
- // other int ids
- const int id = (signed short)id_;
-
- wxMenuItem * const mitem = mbar->FindItem(id);
- if ( mitem )
- return ProcessCommand(mitem);
- }
+ wxMenuItem * const mitem = FindItemInMenuBar((signed short)id);
+ if ( mitem )
+ return ProcessCommand(mitem);
}
}
+#endif // wxUSE_MENUS
- return wxFrameBase::HandleCommand(id_, cmd, control);;
+ return wxFrameBase::HandleCommand(id, cmd, control);;
}
#if wxUSE_MENUS
-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+bool
+wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU WXUNUSED(hMenu))
{
- int item;
- if ( flags == 0xFFFF && hMenu == 0 )
- {
- // menu was removed from screen
- item = -1;
- }
-#ifndef __WXMICROWIN__
- else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
- {
- item = nItem;
- }
-#endif
- else
- {
- // don't give hints for separators (doesn't make sense) nor for the
- // items opening popup menus (they don't have them anyhow) but do clear
- // the status line - otherwise, we would be left with the help message
- // for the previous item which doesn't apply any more
- DoGiveHelp(wxEmptyString, true);
+ // sign extend to int from unsigned short we get from Windows
+ int item = (signed short)nItem;
- return false;
- }
+ // WM_MENUSELECT is generated for both normal items and menus, including
+ // the top level menus of the menu bar, which can't be represented using
+ // any valid identifier in wxMenuEvent so use an otherwise unused value for
+ // them
+ if ( flags & (MF_POPUP | MF_SEPARATOR) )
+ item = wxID_NONE;
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
event.SetEventObject(this);
- return HandleWindowEvent(event);
+ if ( HandleWindowEvent(event) )
+ return true;
+
+ // by default, i.e. if the event wasn't handled above, clear the status bar
+ // text when an item which can't have any associated help string in wx API
+ // is selected
+ if ( item == wxID_NONE )
+ DoGiveHelp(wxEmptyString, true);
+
+ return false;
}
bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
projects / wxWidgets.git / blobdiff