Commit Graph

181 Commits

Author SHA1 Message Date
Włodzimierz Skiba
b9a958e66f wxWinCE warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 13:16:52 +00:00
Julian Smart
7e02be855d Applied patch from Neil Robinson to allow manipulation of unattached menubars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 16:29:05 +00:00
Robin Dunn
84d08d87eb Fix for bug #1422217. Menu items with the checked bitmap set need to
be owner drawn.  This also fixes submenu items that have a bitmap.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 20:59:24 +00:00
Jamie Gadd
2919a8b5af InsertMenuItem can be used by submenus having bitmaps also
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 13:28:52 +00:00
Włodzimierz Skiba
7ec698211d Various source cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 20:14:39 +00:00
Vadim Zeitlin
259c43f679 more extra semicolons removed (patch 1303724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:16:57 +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
Vadim Zeitlin
99f0dc6887 fixed handling of the accelerators of menu items added to already attached submenus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 22:29:47 +00:00
Włodzimierz Skiba
7bea7b9148 Helpers in disabling warnings for unused params.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-30 15:31:20 +00:00
Vadim Zeitlin
5c5871a4fc fixed appending menu items for a (popup) menu with a title broken by last change (and also fixed inserting in this case which didn't work even before last change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-24 00:09:34 +00:00
Vadim Zeitlin
e708485244 fix index of appended items (broken by previous commit)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-16 00:34:43 +00:00
Vadim Zeitlin
858cab30be WinCE compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-15 22:04:53 +00:00
Vadim Zeitlin
9f7e1cff95 don't statically link to SetMenuInfo(): it is not present in Win95/NT4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-09 20:13:20 +00:00
Vadim Zeitlin
ec4b529041 define MIM_STYLE and MNS_CHECKORBMP for mingw32 which doesn't have them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-08 13:56:45 +00:00
Vadim Zeitlin
783e2cc648 InsertMenuItem() works with bitmaps under Win98 too (not only ME)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-07 20:13:48 +00:00
Włodzimierz Skiba
ed7fdb8606 First part of '[ 1216148 ] cleanup: unused variables and declarations'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-07 19:16:15 +00:00
Vadim Zeitlin
cb9eed05d6 use InsertMenuItem() for more native support of bitmaps in menu items when available (fixes bug 1211907)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-07 18:30:26 +00:00
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Julian Smart
3519d94676 MF_BYCOMMAND is zero so don't try to test it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-02 15:16:53 +00:00
Dimitri Schoolwerth
d2103c8ca5 fixed signed/unsigned mismatch warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-18 00:16:53 +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
Julian Smart
a9102b3671 Implemented PocketPC menubar/toolbar as wxToolMenuBar derived
from wxToolBar, solving the problem of how normal toolbars
can co-exist with combined ones. Tidied up WinCE toolbar code.
Implemented wxToolBar as 'dummy' toolbar under Smartphone.
Dialogs now show an empty menubar to hide inactive one
underneath.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-16 17:51:41 +00:00
Vadim Zeitlin
36f1f45649 fixed the checked flag value for events from check items in popup menus (patch 1079015; closes bug 1071598)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-31 15:11:10 +00:00
Włodzimierz Skiba
598ddd96f4 Source cleaning: -1/wxID_ANY/wxDefaultCoord, ::, !!, TRUE/true, FALSE/false, whitespaces, tabs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 10:18:55 +00:00
Włodzimierz Skiba
665b71b17c Warning fixes for WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-16 06:34:53 +00:00
Julian Smart
3fd239fab9 Small WinCE symbol fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-13 16:11:40 +00:00
Robert Roebling
3d4875664f Applied new master define for CommandBar vs. PocketPC mixed bar.
This also works now under Handheld PC 2000.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-12 23:01:02 +00:00
Robert Roebling
781a24e82f Compile fixes for HANDHELDPC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-11 19:15:40 +00:00
Julian Smart
a9928e9d1a WinCE Standard SDK improvements including adding close button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-27 11:31:12 +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
Julian Smart
960b193e59 Don't use wxUSE_POCKETPC_UI, determine appropriate UI from
SDK defines.
Now creates menubar at bottom of window for PPC.
Window uses default position and size in PPC.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-20 22:17:24 +00:00
Vadim Zeitlin
af498247c5 make XTI compile with VC6 (patch 896614)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-15 22:51:57 +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
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