Commit Graph

67 Commits

Author SHA1 Message Date
Vadim Zeitlin
88f67c2242 test for special keys first, before testing for alphanumeric ones as even keys such as WXK_F2 can be recognized as alnum in some locales, in ToString() (modified patch 1669197; bug 1620758)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 23:40:22 +00:00
Robin Dunn
f24b783af3 Revert menus and toolbars to using wxNewId() too since their IDs can't
be negative either


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 06:43:59 +00:00
Vadim Zeitlin
9249d38d6e use wxWindow::NewControlId() instead of wxNewId() to avoid clashes with the user-defined ids
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 14:15:54 +00:00
Robin Dunn
97b2445934 It is not "Invalid" to have a menu item without an accelerator, so
don't be noisy about it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-08 20:04:15 +00:00
Vadim Zeitlin
345319d60c fixes to menu stock items support (patch 1547639)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-05 21:00:55 +00:00
Vadim Zeitlin
90527a50d7 use (new) wxAcceleratorEntry::Create() instead of recently deprecated wxGetAccelFromString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-04 23:56:56 +00:00
Robert Roebling
ee0a94cfc2 Commited FRM's stockitem patch (empty stock items).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-03 12:23:04 +00:00
Vadim Zeitlin
eeee4050cf correct i18n problems in accel handling code (replaces patch 1465417; closes bug 1464912) and a lot of cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-24 00:56:24 +00:00
Włodzimierz Skiba
faa94f3ec8 Final and global PRIOR/NEXT change: keep consistency using only PAGE versions, deprecate old ids, remove rest of build problems with case statemets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 12:25:17 +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
Włodzimierz Skiba
0ad966eeac Allow translated 'Space' in menu accelerators (perhaps more entries should allow it).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 19:06:45 +00:00
Vadim Zeitlin
259c43f679 more extra semicolons removed (patch 1303724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:16:57 +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
Michael Wetherell
eb76ad0b3b Remove duplicate code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-19 13:24:38 +00:00
Włodzimierz Skiba
7448de8d8d [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 17:08:42 +00:00
Włodzimierz Skiba
902725eefe Source cleaning inspired by and included in patch '[ 1215450 ] cleanup: unreachable code.'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-06 16:47:04 +00:00
Robert Roebling
bbcd40851c Add conversion to and from menu hotkeys and
their GTK pendants.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-21 16:05:29 +00:00
Ryan Norton
d161e2f39a use atoi instead of sscanf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-18 21:24:03 +00:00
Włodzimierz Skiba
525d858363 Last .empty() string source cleaning before 2.5.4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-02 13:57:02 +00:00
Julian Smart
7d098cfdd7 Don't return a broken accelerator object if the accelerator was not
recognised.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-12 16:06:13 +00:00
Ryan Norton
0c6099b79e Revert files to previous version that were affected by wxIsXXX((wxChar)X) change. Note - passing a negative value to those c lib functions is undefined, and could return true on platforms using a lookup table, for example (might crash also?), which is what will happen when casting to char to ansii mode and a char is above 127
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-06 07:09:35 +00:00
Włodzimierz Skiba
32b1391332 Warning fixes to unused variables, int/wxChar keycode and other typecasting, not mixing 'type*' and 'type' variables in single line, IsEmpty to empty replacement etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 21:18:04 +00:00
Włodzimierz Skiba
4e32eea148 Source cleaning: whitespaces, tabs, -1/wxDefaultCoord/wxID_ANY/wxNOT_FOUND, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 22:23:59 +00:00
Vadim Zeitlin
082006f3ab detach removed submenu from the menubar too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-25 23:13:57 +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
David Elliott
dbdf9a176f wxMenuBase changes:
1. GetMenuBar() tries GetParent()->GetMenuBar() first (traverse up hierarchy).
2. IsAttached() returns true if GetMenuBar() returns a menubar.
3. AddSubMenu() does not call Attach() on added submenus.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-30 00:49:21 +00:00
Robert Roebling
6d9713540d New menu code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 20:19:20 +00:00
Robert Roebling
5ce61d9fd2 Don't do toolbar and menu UI updates if
the owning frame or TLW is about to
    get deleted anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 22:32:00 +00:00
Robin Dunn
e0dd12db99 Using a -1 (wxID_ANY) for menu or toolbar item IDs will now generate a
new ID for the item using wxNewId().  As a consequence of this, the
value of wxID_SEPARATOR was changed from -1 to -2 in order to not
clash.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 23:28:11 +00:00
Robin Dunn
9add93670b wxMenu::Append (and similar) now return a pointer to the wxMenuItem
that was added.  Checked on MSW, GTK, and Mac, other port authors
please double check changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-23 18:46:05 +00:00
Stefan Csomor
a380af4dbf ambiguous operator[] access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:19:55 +00:00
Julian Smart
41efa9a7cb Added 'Back' to accelerator possibilities
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-08 16:38:28 +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
Vadim Zeitlin
1ab378c03f fix for a warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 22:28:39 +00:00
Julian Smart
1c193821a9 More WinCE mods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 11:21:47 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:55:12 +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
Vadim Zeitlin
70dc287a39 removed wxFunction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-01 12:19:10 +00:00
Vadim Zeitlin
20aed02647 fixed compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-17 18:09:55 +00:00
Julian Smart
01ebf75203 Platform and compiler-specific checking for MSW and Mac now done
in wx/xxx/chkconf.h.
Removed some very obsolete settings, and MSW-specific settings
from Mac's setup0.h.
wxTimer now derives from wxEvtHandler.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-16 12:31:45 +00:00
Robin Dunn
1e93ca1729 Ensure that a wxMenuItem's parent menu is updated if it is removed
from one and added to another menu.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-10 23:48:46 +00:00
Václav Slavík
c53207a546 added CompareAccelString function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-25 11:18:13 +00:00
Václav Slavík
876262caf1 allow untranslated accelerators, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 16:45:47 +00:00
Vadim Zeitlin
73baf01ab3 compilation fix (sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-10 11:43:39 +00:00
Vadim Zeitlin
41b78190ad recognize ESC[APE] in menu accel strings (patch 733967)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-10 00:56:07 +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
Gilles Depeyrot
c921fd5994 Only call use uppercase letter if control, alt, or shift is held down,
otherwise lower case accelerators won't work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-01 13:45:49 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Vadim Zeitlin
d65c269b3f 1. implemented radio menu items for wxGTK
2. changed (in most cases blindly) code for all the others
3. added wx/features.h
4. update wxMenu[Item] docs

----------------------------------------------------------------------
Committing in .

Modified Files:
	distrib/msw/tmake/filelist.txt docs/changes.txt
	docs/latex/wx/menu.tex docs/latex/wx/menuitem.tex
	include/wx/defs.h include/wx/menu.h include/wx/menuitem.h
	include/wx/gtk/menu.h include/wx/gtk/menuitem.h
	include/wx/mac/menuitem.h include/wx/motif/menuitem.h
	include/wx/msw/menuitem.h include/wx/os2/MENUITEM.H
	include/wx/univ/menuitem.h samples/menu/menu.cpp
	src/common/menucmn.cpp src/gtk/menu.cpp src/mac/menuitem.cpp
	src/motif/menuitem.cpp src/msw/menuitem.cpp
	src/os2/MENUITEM.CPP src/univ/menu.cpp
Added Files:
	include/wx/features.h
----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-18 19:41:35 +00:00