Commit Graph

299 Commits

Author SHA1 Message Date
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
Robin Dunn
49826dabe6 Fix wxGTK's menu and menubar so Insert does something other than
always append.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-22 22:05:52 +00:00
Robert Roebling
f0b72e0d9a Fix incomplete stripping of menu text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-18 10:15:52 +00:00
David Elliott
6edf110703 GetMenuBar() now traverses up the hierarchy so it no longer has to be done here.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-30 00:56:09 +00:00
Robert Roebling
c0d0a5520e Added missing "break;".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 19:07:33 +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
71628a57aa Upported menu bitmaps from 2.4.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-22 17:29:34 +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
Julian Smart
dac3065d25 WXK_PRIOR/WXK_NEXT are aliases for WXK_PAGEUP/WXK_PAGEDOWN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-26 11:33:15 +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
da0b5338fe set event object correctly for the menu events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 23:26:11 +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
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
Vadim Zeitlin
33caa9948d make accelerators for bitmap menu items work (patch 626048)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-01 23:15:09 +00:00
Robin Dunn
368a4a4784 Prevent a Gtk-CRITICAL message when Remove()ing a menu from a menubar
that has submenus.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-23 21:08:42 +00:00
Robin Dunn
4e6beae5ec Handle checkable items the right way in all cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-04 22:21:38 +00:00
Robin Dunn
02822c8cdf Correction to my new menu code: handle submenus on menubar menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-03 21:01:52 +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
e6396ed451 Applied patch [ 681262 ] Add EVT_MENU_OPEN support for GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:02:30 +00:00
Robert Roebling
d9e403cc40 Support underscroes in menu item names under GTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 10:13:58 +00:00
Ron Lee
b1d4dd7add Split this out from other changes to keep things sane..
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 05:17:41 +00:00
Julian Smart
75c116ab2c Applied patch [ 649599 ] Fixes bug 610850: Inserting a menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 21:23:25 +00:00
Gilles Depeyrot
7cf4f7e21f fix FindMenu broken by implementation of double ampersands in menu and menu
item titles (finding "&File" was no longer working)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:44:48 +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
8f262dc567 fix for radio items creation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-06 18:23:09 +00:00
Vadim Zeitlin
982f23fd00 better use strncpy() than strncat() with uninitialized buffer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-13 19:40:41 +00:00
Robert Roebling
fab591c5cc Lots of updates for Unicode and GTK 2.0 support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-05 17:59:20 +00:00
Václav Slavík
4e9cbd33d0 ported characters escaping in menus to GTK+ 2.0
(it is now possible to have / in menu entries, unlike in case of GTK+ 1.2;
and \ was fixed to work in 2.0)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-07-28 18:48:36 +00:00
Julian Smart
5869f93fc8 Moved flicker-removal to GTK+ code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-18 15:57:39 +00:00
Vadim Zeitlin
705dd80af1 don't send the events for the radio menu items being unchecked
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-26 14:09:55 +00:00
Vadim Zeitlin
24bcaec367 more fixes to radio menu items: fixed Check() for them; allow separators inside the radio groups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-25 16:30:22 +00:00
Vadim Zeitlin
092f753690 fixed the menu bug introduced by the previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-25 14:31:43 +00:00
Vadim Zeitlin
2368dcda39 compatibility constructors for wxMenuItem() taking bool instead of wxItemKind
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-23 01:23:11 +00:00
Václav Slavík
546bfbea81 wxITEM_FOO instead of wxItem_Foo, for the sake of consistency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-22 19:18:51 +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
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
9e691f46b2 changes to make wxGTK compile with GTK+ 2.0: now it does but the minimal
sample crashes on startup


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-12 19:24:30 +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
7dbf536065 typo in IMPLEMENT_DYNAMIC_CLASS fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-06 14:10:36 +00:00
Vadim Zeitlin
621b3e2127 IMPLEMENT_DYNAMIC_CLASS fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-06 01:42:02 +00:00
Vadim Zeitlin
903506828b fixes for the compilation warnings with Sun CC:
1. some fixes for "String literal to char * conversion" warnings (many
   more left in the *.xpm files)
2. fixes for "assignment of function to extern "C" function"
3. a few other miscellaneous ones


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-09 12:49:12 +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
Robert Roebling
d76419bd54 Make wxMenuItem::GetLabel() handle escaped underscores
(which are '__') correctly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-07 14:55:03 +00:00
Robert Roebling
cc47eed9ca Corrcted accel keys for bitmap menus.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-09-12 08:18:03 +00:00
Julian Smart
37d403aa1c Added to wxSystemSettings for better GTK+ themes compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-09-01 08:35:30 +00:00
Bryan Petty
3ca6a5f046 second merge of the 2.2 branch (RL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Vadim Zeitlin
e72007907a call wxMenubarSetInvokingWindow for submenus appended during run-time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-14 18:28:19 +00:00
Vadim Zeitlin
5f170f33fd 1. some patches from Janos Vegh to docview template detection
2. fixed reentrancy bug in wxGetTranslation/wxLogError resulting in infinite
   number of messageboxes
3. wxMenuItem::GetLabelFromText("&Foo") now returns "Foo", not "&Foo" in GTK
   as well
4. test for update region being NULL in wxPaintDC


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-13 15:48:03 +00:00