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

181 Commits

Author SHA1 Message Date
Václav Slavík
008809c73c Prevent idMenuTitle from being accidentally used as invalid wx ID. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-05-09 10:27:44 +00:00
Václav Slavík
163e127d2e Fixed popup menu's title to be bold regardless of method used. 
Popup menus with title set via SetTitle() had bold font, but menus
created by passing title as ctor argument used normal font. Fixed this
by using the same code (SetTitle) in both cases, instead of having two
independent (and out of sync) implementations of the same functionality.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-05-09 10:27:35 +00:00
Vadim Zeitlin
7118e711dc Move wxMSW wxMenu::GetWindow() down to wxMenuBase. 
GetInvokingWindow() can only be used for the popup menus which have the
invoking window, so add a new function which can be used to get the window
associated with any kind of menu in all ports -- it already existed in wxMSW
but is needed elsewhere too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-24 15:07:39 +00:00
Vadim Zeitlin
e3f5caa223 Return correct invoking window for submenus of a popup menu. 
SetInvokingWindow() is only called for the top menu being popped up itself but
the invoking window should also be associated with its submenus.

Modify GetInvokingWindow() to return the parents invoking window for submenus.

This fixes a crash due to returning NULL from wxMenu::GetWindow() in wxMSW
owner-drawn code.

And it also makes redundant some code in wxUniversal wxMenu implementation
which can now simply use GetInvokingWindow() in all cases.

Closes #11957.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-22 11:21:35 +00:00
Vadim Zeitlin
c71238020c Remove the extra margins when checking owner drawn menu icons size. 
The extra +4 in IsLessThanStdSize() functions resulted in assert failures
under Windows XP after the ownerdraw drawing changes so remove it as nobody
knew why was it there anyhow.

Also replace IsLessThanStdSize() with IsGreaterThanStdSize() to allow using it
directly instead of always testing for !IsLessThanStdSize().

See #11657.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-21 14:40:28 +00:00
Vadim Zeitlin
9c32ed26a2 Correct alignment of menu accelerator strings in owner-drawn menus. 
Draw them right-aligned as the native menus do.

Closes #11479.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-23 13:21:46 +00:00
Vadim Zeitlin
aa4919edd1 Use theme functions for drawing owner-drawn menus. 
This makes the menu items with custom attributes or bitmaps look more native,
especially on post-XP systems.

Closes #11420.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-23 13:21:36 +00:00
Vadim Zeitlin
d08504dfa5 Fix calculation of the margins for owner-drawn menu items. 
Take into account the widths of the bitmaps properly.

Closes #11268.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-23 13:21:27 +00:00
Vadim Zeitlin
4e7c767fed Set up menu bitmaps correctly for checkable items. 
We must not set MENUITEMINFO::hbmpItem for the checkable items as it would
then be used for both checked and unchecked state.

Closes #11244.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-23 13:21:20 +00:00
Vadim Zeitlin
98fbab9e7b Refactor owner-drawing code. 
Only keep common code in the base class and extract all menu/listbox-specific
stuff into derived classes.

This makes the code cleaner and more maintainable but introduces some problems
in wxCheckListBox appearance which will be fixed by the next patch.

Closes #10635.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-23 13:21:12 +00:00
Vadim Zeitlin
bbb8a1aad6 Use checked bitmap for menu items under Vista. 
The normal (unchecked) bitmap was always used for the menu items under Vista,
fix this and do use the checked bitmap if needed.

Closes #11244.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-26 13:31:32 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT(). 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-23 20:30:22 +00:00
Vadim Zeitlin
43b2d5e7c3 Put braces around all calls to wxLogFunctions() inside an if statement. 
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-20 16:47:54 +00:00
Vadim Zeitlin
a5d85ef032 don't make the items owner drawn unnecessarily under recent Windows systems; fix handling of checked/unchecked bitmaps under Vista too; simplify the code by refactoring bitmaps handling in a separate function 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-23 12:09:58 +00:00
Vadim Zeitlin
a0c9006654 don't use HBMMENU_CALLBACK under Windows Vista as this results in losing the themed menu display 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-21 21:31:21 +00:00
Vadim Zeitlin
664e13143e renamed wx/ptr_shrd.h to wx/sharedptr.h; split wx/ptr_scpd.h in wx/scopedptr.h and wx/scopedarray.h; extracted common parts into new wx/checkeddelete.h 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-03 12:01:46 +00:00
Vadim Zeitlin
33f4afdbc0 define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp now needs them too 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-31 20:52:44 +00:00
Vadim Zeitlin
37ddd6ea64 don't use built-in support for menu bitmaps if they are too big, they don't come out correctly then (see #10452) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-31 18:12:14 +00:00
Vadim Zeitlin
67fdb6f9af added CreateAccelTable() helper which creates the accel table for just this menu 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-27 16:45:24 +00:00
Vadim Zeitlin
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-02 02:39:52 +00:00
Vadim Zeitlin
7802da36fa don't duplicate base class m_acceleratorTable as m_accelTable in wxMenuBar, this is not only unnecessary but also doesn't allow using GetAcceleratorTable() to retrieve the menu bar accelerators (#9654) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-03 22:15:40 +00:00
Vadim Zeitlin
8a9e5d8590 compilation fix for eVC4: include commctrl.h explicitely 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-18 13:47:05 +00:00
Vadim Zeitlin
67cb1dfa7f support disabling items before adding them to the menu (#3423) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-03 15:42:18 +00:00
Vadim Zeitlin
dca0f65178 more /Wp64 warning fixes: mostly use UINT_PTR instead of UINT and define our WX[WL]PARAM with __w64 if available to avoid hundreds of warnings when casting LPARAMs to pointers/handles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-28 02:22:52 +00:00
Vadim Zeitlin
05be97a866 fix signed/unsigned comparison warnings 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-15 17:50:02 +00:00
Vadim Zeitlin
660e7fda2c fix several problems in handling of the menu items with negative ids 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-17 20:38:07 +00:00
Vadim Zeitlin
deac32b034 reverted last changed (r49413) as deleting non-attached menus fails under Windows 95 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-30 18:51:16 +00:00
Vadim Zeitlin
cfdcfeafbe always delete the menus, even if the menu is attached (at the very least this fixes Purify warnings) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-24 23:41:45 +00:00
Vadim Zeitlin
0edeeb6d96 use wxWindow::NewControlId() instead of wxNewId() to avoid clashes with user-defined ids; bug fixes in wxMSW for negative menu and toolbar items ids 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-20 22:58:55 +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
2e297951cd we must use TB_BUTTONSTRUCTSIZE before adding menu items to the toolbar; also send SHCMBM_GETMENU after creating the menus, otherwise it always returns NULL 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-29 13:56:05 +00:00
Vadim Zeitlin
d6f2a8911e many compilation fixes for WinCE using VC8 (it now build, although still doesn't work) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-27 16:34:24 +00:00
Václav Slavík
e0a050e347 more changes to make wx compile without implicit wxString->char* conversion (for STL build) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-20 07:44:45 +00:00
Vadim Zeitlin
191abe25ad correct the checked flag in the event generated by checkable menu items (fixes bug introduced in 1.144, patch 1685634) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-22 03:01:50 +00:00
Václav Slavík
c9f7896861 first phase of transition to unified Unicode build: 
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*)
2. added template type-safe wrappers for vararg functions
3. added wxUniChar class representing single Unicode character
4. changed wxString::operator[] and wxString::iterator to return wxUniChar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-17 10:26:10 +00:00
Vadim Zeitlin
f4322df68b no changes, just removed TABs/trailing spaces 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-07 22:56:34 +00:00
Chris Elliott
a0369cb367 fix for sf bug 1671804 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-07 09:31:30 +00:00
Vadim Zeitlin
18138662ef update the popup menu item when it's [un]checked too, as it already happens for the items in the main menu bar 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-02-11 00:58:11 +00:00
Vadim Zeitlin
9c80e160ec reverted wrong change of rev 1.129 and fixed the first part of bug 1422217 in a better way by using InsertMenuItem() correctly for checkable items 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-01-11 01:21:42 +00:00
Julian Smart
3633deedb4 Fix for missing separator if any previous items were ownerdrawn 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-01-09 21:19:09 +00:00
Julian Smart
99a7bebb65 Temporary fix for inconsistent menu item margins (see Quit item in ownerdraw sample) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-12-28 13:52:58 +00:00
Julian Smart
be326aad64 Less drastic compile fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-26 10:37:21 +00:00
Julian Smart
3c1669aaa3 Using MinGW 3, no hbmpItem 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-26 09:05:02 +00:00
Włodzimierz Skiba
57bd4c6031 Include wx/msw/wrap*.h according to pch support (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-07 19:01:45 +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
Stefan Neis
6a17b868de Fixed typos in comments (patch #1515724) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-02 21:40:38 +00:00
Vadim Zeitlin
c849ecefc2 don't refresh the menu if it's frozen 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-02 00:17:42 +00:00
Włodzimierz Skiba
2bd6022f1c Include commctrl.h properly. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-30 07:43:05 +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
Julian Smart
72e7ec5b6a Add menus even if we have no menubar HMENU (Windows Mobile 5.0 can't retrieve it). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-15 09:55:55 +00:00