Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,934 Commits 1 Branch 330 Tags
a343ac03ce1a1036d75b815db7e064b5747af59d
Commit Graph

74 Commits

Author SHA1 Message Date
Paul Cornett
cabb286d30 move 8 copies of the same function to common code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-11 05:23:53 +00:00
Julian Smart
94f6d685cb Preserve original menu label for later retrieval 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-08-11 22:09:20 +00:00
Julian Smart
52af3158e9 Menu label consistency changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-08-11 17:54:59 +00:00
Vadim Zeitlin
4c1e8a6952 gcc signed/unsigned comparison warning fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-30 21:47:47 +00:00
Julian Smart
f17e0ebd63 Fixed assert when moving out of a menu 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-17 17:18:57 +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
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-05 20:47:48 +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
Julian Smart
fbb67d0e52 Guard against comparing invalid iterators, which produces an assertion 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-23 13:58:51 +00:00
Włodzimierz Skiba
3b3dc8019a Include wx/menu.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-18 07:13:20 +00:00
Włodzimierz Skiba
ed4b0fdca6 Include wx/dcclient.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-06 21:51:49 +00:00
Włodzimierz Skiba
76b49cf49b Include wx/frame.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-05 08:10:55 +00:00
Vadim Zeitlin
e633eb2f36 re-fix operator?: involving wxNodes and compatibility_iterators 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-25 03:14:13 +00:00
Vadim Zeitlin
27b436242e 1. fixed compilation after wxList::compatibility_iterator changes 
2. removed #if wxUSE_STL tests which are not needed any longer
3. better fix for SetCurrent() virtual hiding: just rename the method


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-23 16:29:02 +00:00
Vadim Zeitlin
6f02a879ed make access specifiers for the virtual functions match their access in the base class (patch 1400131) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-08 21:47:09 +00:00
Włodzimierz Skiba
78f9336500 Blind fixes for warnings in wxTinderbox. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-26 19:22:56 +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
d8809820cc Let the menubar see a menu's keyboard events, and reset menus on dismiss. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-18 21:36:13 +00:00
Włodzimierz Skiba
3ac88cb5cb Warning fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-16 15:26:41 +00:00
Michael Wetherell
ed5903b61b wxPopupTransientWindow::Popup no longer captures the mouse, so do it in 
wxPopupMenuWindow instead, and wxPopupTranientWindow::OnIdle also now disables
the capture when the cursor is inside the popup, so override that too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-14 15:49:19 +00:00
Michael Wetherell
5b3166fda9 On x11 another control may already have the mouse capture when the menu is 
trying to release it's capture, so work around that problem.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-06 13:42:34 +00:00
Julian Smart
a393f450dc Temporary wxUniv menu fix from Michael Wetherell 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-17 10:06:01 +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
Vadim Zeitlin
f52c3131bf VK_MENU is WXK_ALT, notWXK_MENU (patch 1119601) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-19 15:08:36 +00:00
Włodzimierz Skiba
c47addef10 wxPoint/Size/Rect() causes the same code with (0,0) initialization and is incomparably more readable and clear. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-16 20:34:34 +00:00
Włodzimierz Skiba
8b5d5223d1 Various cleanings. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-11 10:42:05 +00:00
Włodzimierz Skiba
0966aee3d9 wxEmptyString decorations. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-10 17:25:11 +00:00
Włodzimierz Skiba
de516ffeea Warning fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-01-12 15:57:59 +00:00
Włodzimierz Skiba
9f9f75b380 Fix the assert of not reset highlighted menu item pointer. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-22 12:36:07 +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
c553658918 Fixed sending events by submenus. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-23 15:45:47 +00:00
Włodzimierz Skiba
a290fa5a7d Cleaning of sources (Univ related files). -1/TRUE/FALSE/wxIDY_ANY/wxDefaultCoord/whitespaces/!! issues. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-10 13:08:43 +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
4224f05975 Instead of m_menuBar use GetMenuBar() which will be modified (with next patch) 
to traverse up the menu hierarchy to return the menu bar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-03-30 00:43:16 +00:00
Julian Smart
dba6b4f880 Applied patch [ 892543 ] wxUniversal: Bitmaps in disabled menu items 
Christian Sturmlechner


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-08 12:38:31 +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
Vadim Zeitlin
e441e1f4e8 made wxNO_FULL_REPAINT_ON_RESIZE default, added wxFULL_REPAINT_ON_RESIZE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-24 00:26:40 +00:00
Julian Smart
8a39593ebe Applied patch [ 808050 ] fixes for WXUNIVERSAL and UNICODE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-18 14:03:09 +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
Mattia Barbon
ac32ba44a1 wxX11 and wxMotif STL-ification, part 1. it does not compile. 
yet, but keeps the diff between my local copy and HEAD < 4000
lines...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-21 20:00:38 +00:00
Julian Smart
e39af974ef - Moved wxApp::SendIdleEvents and wxApp::ProcessIdle into common code. 
- wxWindow::OnInternalIdle is now used in all ports, and ensures that
  user OnIdle events do not interfere with crucial internal processing.
- wxWindow::UpdateWindowUI is now a documented function that
  sends wxUpdateUIEvents, and can be overridden. It has a helper function
  DoUpdateWindowUI for taking appropriate wxUpdateUIEvent action.
- Added functions to wxUpdateUIEvent: Set/GetMode, Set/GetUpdateInterval,
  CanUpdate, to assist with optimising update event frequency.
- Added functions to wxIdleEvent: Set/GetMode, CanSend, to
  determine whether a window should receive idle events.
- Added wxWS_EX_PROCESS_IDLE, wxWS_EX_PROCESS_UI_UPDATES window
  styles for use with conservative idle and update event modes.
- wxMSW and wxGTK now send menu update events only when a menu is
  about to be used.
- Added WM_INITMENU processing instead of WM_ENTERMENULOOP, or
  accelerators don't always get called since menu items may still
  be disabled.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-09 10:15:21 +00:00
Julian Smart
6aa89a22b8 Fixed copyrights and licence spelling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-17 11:55:54 +00:00
Julian Smart
6f7c5199ed Applied patch [ 677730 ] Menus with radio items (wxUniv) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-02-02 14:50:05 +00:00
Julian Smart
90b18154c8 Applied patch [ 597320 ] Return wxNotebook::SetSelection value 
By Hans Van Leemputten (hansvl)

According to the documentation
wxNotebook::SetSelection() should return the previous
selection... (Like wxMSW does) but the wxUniv version
returns the currently selected selection.

Patch was tested with wxX11.

Applied patch [ 597313 ] Popup menu still used after deletion

By Hans Van Leemputten (hansvl)

- This patch exists out of 2 parts;

Part 1 is a patch to show the problem with the menu
sample (this part is just to show the problem and should
not be put into CVS!).

Part 2 is the fix and should be put in CVS.
(src/univ/menu.cpp)

- Instructions to reproduce the problem with the menu
sample:
1. Apply part 1 of the patch only.
2. Run the sample after recompiling it.
3. Press "Close Test" -> "Close", this will basically
remove the current menu bar and recreate it again and
re-use the menu item "Close test" from the old menu
bar...
4. Again press "Close Test", doing this will already
crash the sample.

- The cause of the problem is that the m_popupMenu in
wxMenu is deleted because it is a child of the old menu
bar (Note: it does not get destroyed by the wxMenu
destructor, but by DestroyChildren()) and m_popupMenu
is not put back to NULL when this happens...

- This patch was tested only with wxX11.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-08-20 08:34:05 +00:00
Julian Smart
8601b2e15b Modifications to get wxNanoX compiling again 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-04-01 14:09:44 +00:00
Robert Roebling
c2c0dabfa6 More changes for better redraw flow under X11. 
Probably fixed problem with TLW appearing wrong.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-28 18:57:50 +00:00
Vadim Zeitlin
e4052bd3e6 compilation fix after wxMenuItem changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-19 16:13:43 +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