Commit Graph

79 Commits

Author SHA1 Message Date
Vadim Zeitlin
10816efb2c added virtual wxFrame::FindItemInMenuBar(): overriding it in wxMDIParentFrame allows to look for the items in the active child when giving help for the current menu item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-18 17:03:38 +00:00
Vadim Zeitlin
722ed5bed5 removed unused statusbar parameter from wxFrameBase::ShowMenuHelp()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-18 16:44:31 +00:00
Vadim Zeitlin
6d99eb3e37 Undid last commit and restored bool argument to wxFrame::DoGiveHelp() as
removing it could silently break existing user code overriding this function.

Fix the problem with not restoring the original status bar text when the mouse
pointer left the toolbar by simply calling DoGiveHelp() with false as second
parameter only if there was no valid tool under mouse, not if the help string
(for a valid tool) was empty.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-03 18:04:44 +00:00
Vadim Zeitlin
fa36fe3680 removed second parameter of wxFrame::DoGiveHelp(), the help string is always shown (even if it's empty), not hidden; this hopefully really fixes restoring the previously shown status bar text when the menu is dismissed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-02 22:00:52 +00:00
Vadim Zeitlin
6af350d428 clear m_oldStatusText after restoring it, otherwise we could restore it again the next time instead of restoring the up-to-date status bar text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-30 20:06:52 +00:00
Vadim Zeitlin
4cbc928afc restore the old status bar text when DoGiveHelp(false) is called (should fix bug 1340887)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-21 15:56:24 +00:00
Václav Slavík
f257ac8784 fixed compilation for wxUSE_STATUSBAR w/o wxUSE_MENUS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-01 12:01:24 +00:00
Stefan Neis
6a17b868de Fixed typos in comments (patch #1515724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-02 21:40:38 +00:00
Włodzimierz Skiba
3304646d06 Include wx/statusbr.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-09 09:51:39 +00:00
Włodzimierz Skiba
4e3e485bc8 Include wx/toolbar.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-07 17:46:13 +00:00
Włodzimierz Skiba
76b49cf49b Include wx/frame.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-05 08:10:55 +00:00
David Surovell
4d53859584 minor refactoring of menu UpdateUI handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 07:59:38 +00:00
Mattia Barbon
dee1a63ff5 Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.
Changed default for WXWIN_COMPATIBILITY_2_4 to 0.
  Added WXWIN_COMPATIBILITY_2_6 (defaults to 1).
  Ran build/update-setup-h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 15:48:42 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Włodzimierz Skiba
26c36d7505 Do not send event for already selected menu radio item selection.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-10 19:10:52 +00:00
Julian Smart
a9102b3671 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
2005-03-16 17:51:41 +00:00
Vadim Zeitlin
adbc621dcb replaced a weird (and wrong when wxUSE_STL == 1) test for string being empty with empty() call (patch 1089458)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-31 22:08:33 +00:00
Włodzimierz Skiba
1729813a8d Old API clearly deprecated.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-05 19:25:02 +00:00
Robin Dunn
2b02216951 Give SendSizeEvent a generic implementation. It can be useful on
non-MSW platforms as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:20:01 +00:00
Vadim Zeitlin
a4f01f0592 relayout frame contents when tool/statusbar is shown/hidden
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 01:49:45 +00:00
Włodzimierz Skiba
a62848fdba Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 12:08:28 +00:00
Włodzimierz Skiba
f428e6c50f Warning fixes for WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-16 06:24:42 +00:00
Julian Smart
a9928e9d1a WinCE Standard SDK improvements including adding close button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-27 11:31:12 +00:00
Julian Smart
45f272841c Fixes for Standard WinCE SDK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-27 09:09:19 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Julian Smart
960b193e59 Don't use wxUSE_POCKETPC_UI, determine appropriate UI from
SDK defines.
Now creates menubar at bottom of window for PPC.
Window uses default position and size in PPC.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-20 22:17:24 +00:00
Robert Roebling
7ef67c25ff Fix for white area above frame because of funky
toolbar/menubar-mix implementation under eVC 3.0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-15 15:58:25 +00:00
Vadim Zeitlin
8f4d9fcd9a do take the toolbar into account for Windows CE, otherwise the menus overlap with the frame client area
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-04 22:37:11 +00:00
Dimitri Schoolwerth
d1b20379e4 Applied patch #876969: "Fixes to Borland warnings"; Minor code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 22:30:13 +00:00
Julian Smart
a96b4743ff Added wxUSE_POCKETPC_UI to distinguish between using
combined toolbar/menubar and using separate ones


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-28 01:07:31 +00:00
Vadim Zeitlin
96ac065f9e restore status bar text after a menu has been shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 22:55:06 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Julian Smart
bf95a04f16 Added some standard further identifiers to help with WinCE toolbars
Moved wxID_REPLACE to defs.h
Can now add tools to WinCE toolbar, if using standard identifiers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 16:16:14 +00:00
Julian Smart
e2b6d07d7a Added call to top-level window OnInternalIdle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 10:24:30 +00:00
Julian Smart
92f1a59c28 Use WM_INITMENUPOPUP
Added wxMenu member to wxMenuEvent


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 23:09:04 +00:00
Vadim Zeitlin
f9dae7798b added wxTB_HORZ_TEXT (patch 713813); documented it; moved toolbar styles to toolbar.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 10:53:00 +00:00
Julian Smart
18afa2acbe Removed overloaded DoMenuUpdates function since it duplicated
wxMenu::UpdateUI()
Removed routing of menu commands to focus window under Windows
Added routing of menu commands (but not UI updates, for
efficiency reasons) to wxMenuBar before sending to frame


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 14:20:30 +00:00
Julian Smart
e39af974ef - Moved wxApp::SendIdleEvents and wxApp::ProcessIdle into common code.
- wxWindow::OnInternalIdle is now used in all ports, and ensures that
  user OnIdle events do not interfere with crucial internal processing.
- wxWindow::UpdateWindowUI is now a documented function that
  sends wxUpdateUIEvents, and can be overridden. It has a helper function
  DoUpdateWindowUI for taking appropriate wxUpdateUIEvent action.
- Added functions to wxUpdateUIEvent: Set/GetMode, Set/GetUpdateInterval,
  CanUpdate, to assist with optimising update event frequency.
- Added functions to wxIdleEvent: Set/GetMode, CanSend, to
  determine whether a window should receive idle events.
- Added wxWS_EX_PROCESS_IDLE, wxWS_EX_PROCESS_UI_UPDATES window
  styles for use with conservative idle and update event modes.
- wxMSW and wxGTK now send menu update events only when a menu is
  about to be used.
- Added WM_INITMENU processing instead of WM_ENTERMENULOOP, or
  accelerators don't always get called since menu items may still
  be disabled.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 10:15:21 +00:00
Julian Smart
0b30bb0bda Added wxFrameBase::OnMenuOpen, and wxUSE_IDLEMENUUPDATES in platform.h
Experimental wxUpdateUIEvent::SetUpdateInterval() function to limit
UI update frequency


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-07 16:21:44 +00:00
Vadim Zeitlin
c60a36d5dd DoGiveHelp() should be defined even if !wxUSE_STATUSBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 12:40:34 +00:00
Julian Smart
7ac4c27aa6 Pass focus window to submenu items too (no reason I can think of not to).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 20:40:09 +00:00
Robin Dunn
a01fe3d6d2 Fixed menu event propogation to be consistent across platforms, and
with the docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 18:39:20 +00:00
Julian Smart
55d99c7a77 Fixed copyrights and licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:28:33 +00:00
Václav Slavík
ddbfcced85 removed wxTLW cruft now that all ports have it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 15:03:56 +00:00
Mattia Barbon
1f361cddbf Implemented wxStatusBar::Push/PopStatusText.
Implemented wxFrame::Push/PopSTatusText ( just forward to the status bar ).
Implemented wxFrame::DoGiveHelp, to show menu/toolbar help in the status bar.
Added Get/SetStatusBarPane to get/set the status bar pane the menu/toolbar help
  will be show in


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-02 20:07:10 +00:00
Vadim Zeitlin
0472ece753 implemented radio menu items for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-21 02:35:08 +00:00
Julian Smart
16c9a4258f Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation
and allowed for vertical toolbar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-24 23:04:46 +00:00
Václav Slavík
3dbe38c370 fixed menubar attaching: create it first, THEN set pointer to it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-12 10:37:45 +00:00
Gilles Depeyrot
799ea01170 implement out-of-line destructors where needed instead of using __DARWIN__
specific conditional compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-07 21:52:28 +00:00