Commit Graph

147 Commits

Author SHA1 Message Date
Vadim Zeitlin
c25f373e2b as after recent change wxID_SEPARATOR is now -2, it is better for idMenuTitle to be different from -2 as otherwise we have separators instead of menu titles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 15:29:41 +00:00
Julian Smart
8cc4850c2d Patch from "Viktor Voroshylo" <viktor@voroshylo.com>
src/.cvsignore : changes to ignore temorary project files
src/regex/.cvsignore : changes to ignore temorary project files for CE compiler
src/regex/regguts.h : assert will be ignored under WinCE
src/msw/button.cpp : BS_FLAT is not available under winCE
src/msw/clipbrd.cpp : changed CLIPFORMAT to wxDataFormat::NativeFormat so it will compile when ole is not included (under winCE)
src/msw/menu.cpp : GetMenuItemCount is not available under winCE. Using wxMenu::GetMenuCount in this case
src/common/regex.cpp : regex will be included under wince
include/wx/msw/wince/setup.h : wxUSE_THREADS & wxUSE_REGEX is enabled by default (as in standard windows configuration)
src/msw/wince/wxWindowsCE.vcp: fixed problem with all configurations (except emu once) do not have procompiled headers setup correctly. Changes for compiling with regex.
src/msw/wince/wxWindowsCE.vcw : added regex in workspace file


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 17:47:37 +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
David Elliott
3d27b5746f When inserting a new menu don't try to find th eposition of the current one
if the menubar is not yet attached.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 02:57:06 +00:00
David Elliott
b2c5f143fd Added MSWPositionForWxMenu() method which is used to translate wxWindows
menu positions to the ones that Windows is using.  This mainly accounts
for the system menu in maximized MDI child frames.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 05:57:09 +00:00
Julian Smart
a96b4743ff Added wxUSE_POCKETPC_UI to distinguish between using
combined toolbar/menubar and using separate ones


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-28 01:07:31 +00:00
Julian Smart
2d36b3d847 WinCE 4 cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-27 17:24:00 +00:00
Ryan Norton
c4053ed35a revert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 21:53:59 +00:00
Ryan Norton
ad18ae6252 Fixed compilation and
only does mdi tests when enabled in setup.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 19:27:47 +00:00
Ryan Norton
010024e17e Fixed one of the two MDI problems...see comments
for possible solutions to the others.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-24 04:47:00 +00:00
Julian Smart
eae4425db6 WinCE fixes from "Viktor Voroshylo" <viktor@voroshylo.com>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-18 21:25:44 +00:00
Vadim Zeitlin
4a1c207cf1 don't return & in strings returned by GetLabelTop() (closes 687905)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-21 15:22:15 +00:00
Mattia Barbon
2341cf5f59 More warning fixes from ABX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 21:09:11 +00:00
Stefan Csomor
3ff066a4ec macro naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 01:19:40 +00:00
Stefan Csomor
ffca575c83 WX_EVENT_PROPERTY instead of WX_DELEGATE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 18:42:14 +00:00
Stefan Csomor
e70b4f1095 unicode adaptions, menu support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 23:33:36 +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
Stefan Csomor
066f1b7a95 xti extensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 17:30:46 +00:00
Julian Smart
beb471b5e9 No significant change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 22:56:10 +00:00
Julian Smart
bf95a04f16 Added some standard further identifiers to help with WinCE toolbars
Moved wxID_REPLACE to defs.h
Can now add tools to WinCE toolbar, if using standard identifiers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 16:16:14 +00:00
Julian Smart
39d2f9a7c8 Added WCE toolbar
Got menubars working with WCE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-18 14:12:53 +00:00
Julian Smart
4676948b68 More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 21:50:07 +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
Mattia Barbon
ba8c160144 Moved some methods/classes inside COMPATIBILITY_2_4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-03 21:59:55 +00:00
Julian Smart
6c9a19aaba Removed erroneous copyright names and corrected licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:23:28 +00:00
Julian Smart
7a0363dd04 Applied patch [ 642157 ] [MSW] HMENU resource leak from wxMenuBar
Latest CVS - When a wxMenuBar is detached
from a frame and deleted the HMENU resource leaks.
This patch fixes the leak.

Scott Pleiter


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 09:29:00 +00:00
Vadim Zeitlin
f7f50f493b return NULL from the functions returning a pointer, not FALSE (patch 544557)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-16 08:57:36 +00:00
Vadim Zeitlin
be15b995df fixes to radio menu items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-24 01:24:16 +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
Ron Lee
820b49cdbf removed superfluous assignment handled in base class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-06 20:43:07 +00:00
Vadim Zeitlin
f736ec7623 fixed assert failure when removing a menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-04 01:29:21 +00:00
Vadim Zeitlin
cdbe233029 fixed spurious assert failure in wxMenuBar::Insert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-04 23:05:53 +00:00
Vadim Zeitlin
b54e41c529 1. fixed typo ('&' instead of '|') in wxNotebook
2. changed wxTC_MULTILINE to be equal to wxNB_MULTILINE and != 0
3. much more efficient selection handling in virtual wxListCtrl,
   we can now select 1000000 items without problems
4. kbd/mouse selection (ctrl/shift handling) fixed in wxListCtrl
5. added wxSortedArray::IndexForInsert() and AddAt(), remove Remove(size_t),
   use RemoveAt() instead


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 22:42:35 +00:00
Julian Smart
ff8b6290e9 Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;
added missing virtual function from wxSliderMSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 11:55:33 +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
4bc1afd502 added text style support to wxTextCtrl for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-27 03:28:28 +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
641f5461b2 IMPLEMENT_DYNAMIC_CLASS() for wxMenuBar correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-01 17:02: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
Ove Kaaven
f5166ed458 Unicode compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-03 02:14:45 +00:00
Václav Slavík
ad81651f00 removed USE_SHARED_LIBRARY(IES)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-14 23:57:30 +00:00
Julian Smart
065de61268 Now allow SetMenuBar to be called several times.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-30 12:21:06 +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
Julian Smart
0e528b997e Added some makefiles, fixed a BC++ problem in controls.cpp; changed some class
ordering for VC++ 1.5


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-06 17:12:10 +00:00
Vadim Zeitlin
dd60b9ec1e compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 01:31:51 +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
678cd6de66 1. corrected (but the fix is ugly) the multiple def button problem
2. corrected a bug which disabled all accels for MSW (sic)
3. added SetValue/GetValue to wxSpinCtrl
4. modified wxGetNumberFromUser to use wxSpinCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-28 01:17:35 +00:00