Commit Graph

47 Commits

Author SHA1 Message Date
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
Vadim Zeitlin
a070d8ce24 added support for non alphanumeric simple character accelerators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-09 12:23:11 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Vadim Zeitlin
adb21613bc fixed FindItem() to work with submenus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-23 17:30:22 +00:00
Robert Roebling
186baeb237 Fixed various bugs (from - err - various authors) related
to inserting and replacing menubars etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-10 17:24:09 +00:00
Vadim Zeitlin
39d03faf4e warnings in wxCHeCK_MSG fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-08 15:08:42 +00:00
Vadim Zeitlin
270e8b6a37 1. wxMenuBar::FindMenu() made "const"
2. documented it
3. documented recent change to wxYield()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-22 10:17:32 +00:00
Vadim Zeitlin
52130557bf moved wxMenuBar::FindMenu(title) from MSW to common code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-22 09:53:55 +00:00
George Tasker
ff0ea71cea Changed code to allow for removal of the #include <windows.h> from wxprec.h for windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-18 12:29:32 +00:00
Vadim Zeitlin
3b59cdbfaf wxMenuItem::GetLabelFromText() added/documented, bug in wxMenu::FindItem() fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-11 13:58:41 +00:00
Vadim Zeitlin
32db328c7a wxMenu::Insert() seems to work, bug in wxMenuBase::Insert() is corrected
(inserting an item at pos == GetCount() should be the same as appending and
not an error)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-04 14:10:31 +00:00
Vadim Zeitlin
9739d9ee80 wxMenu::callback stuff taken inside WXWIN_COMPATIBILITY_2 (everybody should
be happy now)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-15 14:04:06 +00:00
Julian Smart
5b0d48b32a Added m_callback init.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-14 17:51:57 +00:00
Robert Roebling
a583e623c0 Some menu things.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-03 17:48:23 +00:00
Vadim Zeitlin
1dddf8389f bug in wxMenuBase::FindChildItem() corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 15:57:07 +00:00
Vadim Zeitlin
1987af7e9f wxGTK compiles (and seems to work) again after wxMenu changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 15:21:40 +00:00
Vadim Zeitlin
717a57c2fa 1. wxMenu changes: wxMenuBase appears, several new functions for dynamic menu
handling as well
2. new sample: menu
3. small corrections to wxFileHistory made possible by wxMenu changes
4. ugly fix for panel loaded from resources and TABbing
5. wxDataObject &c doc updates


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 01:25:43 +00:00
Vadim Zeitlin
3dfac9707a 1. added wxMenuBarBase
2. corrected typo in gtk/menu.cpp when dealing with Fn accel keys


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-26 19:07:04 +00:00