Commit Graph

135 Commits

Author SHA1 Message Date
Julian Smart
07c8746bad Applied patch [ 681262 ] Add EVT_MENU_OPEN support for GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:08:58 +00:00
Robert Roebling
adb5f43a58 Lots of Pango etc up-ports from HEAD.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-11 11:35:15 +00:00
Julian Smart
a81d920c91 Applied wxMenu::Remove patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-18 21:25:09 +00:00
Gilles Depeyrot
c5c470e6ec 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/branches/WX_2_4_BRANCH@18237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-14 21:44:48 +00:00
Gilles Depeyrot
1a0b595dcd - implemented handling of double ampersands '&' in wxGTK menu item texts in
order to allow embedding an ampersand character in the menu item text
- documented use of double ampersands for menu item texts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-03 21:19:23 +00:00
Julian Smart
ceecd70a6b Added further accelerators, though Up/Down/Left/Right are still
not working for some reason.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-11-05 13:42:23 +00:00
Robert Roebling
54b25889d2 Replaced lots of ANSI/ASCII strings with their
Unicode equivalents, i.e. I put wxT() arounf
    them in lots of places.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-29 21:48:06 +00:00
Ron Lee
d87f50a85e typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-29 04:46:38 +00:00
Robert Roebling
d089223aa3 Lots of minor GTK2 updates.
Added wxFont SetNoAntiAliasing which cannot cause
    problems with existing apps since it doesn't
    changing the current style flags.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-28 00:21:00 +00:00
Robert Roebling
a46cc43fed Combox gets its own SetFocus()
wxDialog() set the focus to itself when shown. This will
    the propagate to some control in the dialog. I am not
    sure if this will override preceding user's call to
    SetFocus() in one of the child windows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-13 21:03:47 +00:00
Ron Lee
292cc8c93e The menubar dynamic sizing patch broke any app which adds an empty
menubar and populates it later.  Since this is (or at least was)
a valid way to use wxMenuBar before that, we need to recalculate
the size whenever it might change.  (We probably need to do it
anyway for this to be completely useful).   This patch isn't the
cleanest or most efficient way to do that, but it's a minimal
change on a new feature that at least restores compatibility.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-01 15:13:44 +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
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
b4da05a638 (failed) attempts at fixing menu bar swapping
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-09 17:53:58 +00:00
Vadim Zeitlin
c4608a8af3 1. warning in gtk/menu.cpp fixed
2. Unicode fix in msw/textctrl.cpp
3. more parameters support in grid editors/handlers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-01 18:55:29 +00:00
Robert Roebling
589c9fff04 Commented out debug code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-29 15:09:09 +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
96fa7876bf unreachable code warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-05 15:17:08 +00:00
Robert Roebling
db434467a1 New colour, font, theme and size code..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-04 13:02:27 +00:00
Robert Roebling
b919f007af Corrected some things in, and some thing revealed by
the Life! sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-03 13:45:20 +00:00
Robert Roebling
1d62a8b425 Change to wxMenuBar::Remove(),
"make dist" knows about src/tiff now,
  configure has a new shared library thing which Debian seems to require.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-04 16:40:27 +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
f03ec224dc wxMenuBar::Insert() seems to work!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-04 13:43:59 +00:00
Robert Roebling
16c1f79c04 New event locking.
Removed CVS trash.
  Some compile fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-28 11:45:29 +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
c0ab6adfed Watcom C++ fixup in tbar95.cpp; removed WXWIN_COMPATIBILITY for 'old' menu
constructor and event handling; added wxString version of wxGetTempFileName


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-14 14:41:30 +00:00