Commit Graph

183 Commits

Author SHA1 Message Date
Vadim Zeitlin
f005ea42f0 fixed handling of accelerators using PageUp/Down keys (bug 1683613)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-19 20:18:20 +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
4fc3eebc01 Compilo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-03 20:12:44 +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
Włodzimierz Skiba
0bca037363 Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 10:02:19 +00:00
Włodzimierz Skiba
670f993563 Include wx/app.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-28 12:44:37 +00:00
Włodzimierz Skiba
e4db172a3b Include wx/log.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-26 08:21:31 +00:00
Włodzimierz Skiba
88a7a4e10e Include wx/intl.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-25 14:38:19 +00:00
Włodzimierz Skiba
aee12bfb80 Fix after removal of PRIOR/NEXT in common headers (duplicates change in GTK2 sources).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 08:22:23 +00:00
Włodzimierz Skiba
44014bcda0 wxTinderbox warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 11:27:22 +00:00
Michael Wetherell
8193978003 Fix link errors from advdll_taskbar.o on cygwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 22:19:14 +00:00
Mart Raudsepp
3cbab64109 Remove GTK2 stuff from src/gtk1. Rename wx/gtk includes to wx/gtk1.
57 files changed, 394 insertions(+), 6767 deletions(-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 01:14:32 +00:00
David Surovell
1a70c9e2bf fix SetInvokingWindow link problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-28 23:02:22 +00:00
Vadim Zeitlin
defdd88800 GTK+ 1 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 02:20:15 +00:00
Vadim Zeitlin
43a11e2a50 moded wxWindow::PopupMenu() from window.cpp to menu.cpp as this allows it to access static functions in menu.cpp; implemented sending of wxEVT_MENU_OPEN/CLOSE for popup menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 01:29:08 +00:00
Vadim Zeitlin
13d3511257 send wxEVT_MENU_CLOSE from menubar deactivate handler, this ensures that the event is sent even when the menu is dismissed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 01:21:27 +00:00
Vadim Zeitlin
cdf003d465 send wxEVT_MENU_CLOSE at least sometimes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 00:44:57 +00:00
Julian Smart
5fd420ed86 Removed GTK+2 bitmap menu item code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-14 08:48:35 +00:00
Vadim Zeitlin
4e115ed2c7 fixed variable shadowing icc warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 00:29: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
Mart Raudsepp
88d197753d Expand tabs, identation/whitespace fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 09:50:13 +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
Robert Roebling
e31126cbd7 committed aupdated patch that adds support for
bitmaps in submenus and simplifies some of
    the code in GtkAppend()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-07 18:09:18 +00:00
Robert Roebling
a8e607d963 Minor correction to the wxMenuItem::SetText() patch.
It also works under GTK 1.2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-18 18:21:30 +00:00
Robert Roebling
98f297837a Readded test for wxMenuItem::SetLabel() to sample.
Support for hotkeys in names functions for GTK+2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-16 16:53:55 +00:00
Vadim Zeitlin
865bb3251e GTK+ callbacks must have C linkage (patch 1157384)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-21 23:42:26 +00:00
Vadim Zeitlin
294ea16de3 implemented wxMenuBar ctor taking array of menus/titles for all ports; added optional flags argument to it (patch 1162726)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-17 23:45:24 +00:00
Robert Roebling
e1bf3ad3e8 Applied patch to reorder includes. Not the most
important patch in the world, but still.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-03 21:13:28 +00:00
Václav Slavík
b1ad1424b9 support alpha channel in menu items bitmaps, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 09:43:37 +00:00
Václav Slavík
a761df69a3 fixed menu destruction if it was removed from menubar with Remove
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 21:00:45 +00:00
Václav Slavík
04cc1e93ed fix for hot keys in menu items (patch 1013082)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-20 20:31:37 +00:00
Václav Slavík
defc0789c1 really fixed wxMenuBar::Remove (bug 610850): reverted incorrect patch 649599 and fixed data corruption and leaks in GTK+ structures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-09 16:08:20 +00:00
Vadim Zeitlin
9959e2b6aa fixed menu titles handling after wxID_SEPARATOR change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-13 16:24:46 +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
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