Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,464 Commits 1 Branch 330 Tags
0d2f3b9d7b05f78fe0806894511fac1ff6b2f627
Commit Graph

93 Commits

Author SHA1 Message Date
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible. 
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-20 18:18:23 +00:00
Vadim Zeitlin
29c7962a9f Use symbolic names for popup menu ids in wxEVT_MENU_HIGHLIGHT events in wxMSW. 
No real changes, just use wxID_NONE instead of hardcoded -1 (in one place) and
-3 (in another one). Hardcoding them not only made the code less readable but
also resulted in two numbers actually becoming different when they almost
certainly were meant to be the same.

This shouldn't result in any changes in the user-visible behaviour but we now
avoid searching the menu bar for menu items with id of -1 needlessly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-22 11:21:30 +00:00
Vadim Zeitlin
62f6be4448 Ensure that frame is re-laid out when its toolbar is deleted. 
The code in wxFrameBase::SetToolBar() didn't work correctly when toolbar was
unset using SetToolBar(NULL) because the frame toolbar pointer was reset
before layout was done resulting in the frame not recognizing its (still
existing) toolbar child as one of its bars and so nothing was done at all when
the frame had a single child, as in the toolbar sample.

Correct this by carefully ensuring that the toolbar pointer is still set at
the moment of the layout but hide the toolbar to ensure that no place is
allocated for it.

Also mention that it is not necessary to call SetToolBar(NULL) at all if the
toolbar is being deleted anyhow in the sample as toolbar does this itself in
its destructor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-28 16:18:37 +00:00
Vadim Zeitlin
f0f03f3242 Don't overwrite status message when restoring it if it changed. 
wxFrameBase::DoGiveHelp() could rewrite the status bar message if it was
changed while the menu was showing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-06 00:21:16 +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
79f9ea0541 remove the recently added MSWFindMenuBarItem() as we already had FindItemInMenuBar() for the same purpose; just change the latter to return a non-const pointer; this fixes help string display in the status bar for the window menu items 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-28 09:14:07 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-19 13:55:27 +00:00
Vadim Zeitlin
a22895511a make code dealing with wxUSE_IDLEMENUUPDATES a bit more clear and avoid warning due to use of this constant in logical boolean expression 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-14 23:26:55 +00:00
Vadim Zeitlin
0dba08dd39 move SendSizeEvent() down to wxWindow from wxFrame; added SendSizeEventToParent() helper 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-29 12:32:47 +00:00
Vadim Zeitlin
a6ac49b198 avoid duplicating wxWindow::HandleCommand() in wxFrame, only handle the commands for the frame menu bar elements there: this avoid generating duplicate events if a command event handler skips 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-05 20:51:16 +00:00
Vadim Zeitlin
fa7134b05a use kind, not id, of a menu item to test whether it's a separator: this allows having separators with ids other than wxID_SEPARATOR in case it's useful to distinguish between them (patch 1929039) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-06 15:55:42 +00:00
Vadim Zeitlin
e047f594b6 use HandleWindowEvent() in ProcessCommand(); return the value this function returns instead of returning true unconditionally 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-30 21:32:17 +00:00
Vadim Zeitlin
3b257996a2 correct typo in last commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-11 13:08:52 +00:00
Vadim Zeitlin
8d22935dcb unused parameter warning fixes for --disable-all-features build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-11 12:55:43 +00:00
Vadim Zeitlin
10816efb2c added virtual wxFrame::FindItemInMenuBar(): overriding it in wxMDIParentFrame allows to look for the items in the active child when giving help for the current menu item 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-05-18 17:03:38 +00:00
Vadim Zeitlin
722ed5bed5 removed unused statusbar parameter from wxFrameBase::ShowMenuHelp() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-05-18 16:44:31 +00:00
Vadim Zeitlin
6d99eb3e37 Undid last commit and restored bool argument to wxFrame::DoGiveHelp() as 
removing it could silently break existing user code overriding this function.

Fix the problem with not restoring the original status bar text when the mouse
pointer left the toolbar by simply calling DoGiveHelp() with false as second
parameter only if there was no valid tool under mouse, not if the help string
(for a valid tool) was empty.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-03 18:04:44 +00:00
Vadim Zeitlin
fa36fe3680 removed second parameter of wxFrame::DoGiveHelp(), the help string is always shown (even if it's empty), not hidden; this hopefully really fixes restoring the previously shown status bar text when the menu is dismissed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-02 22:00:52 +00:00
Vadim Zeitlin
6af350d428 clear m_oldStatusText after restoring it, otherwise we could restore it again the next time instead of restoring the up-to-date status bar text 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-30 20:06:52 +00:00
Vadim Zeitlin
4cbc928afc restore the old status bar text when DoGiveHelp(false) is called (should fix bug 1340887) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-21 15:56:24 +00:00
Václav Slavík
f257ac8784 fixed compilation for wxUSE_STATUSBAR w/o wxUSE_MENUS 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-01 12:01:24 +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
Włodzimierz Skiba
3304646d06 Include wx/statusbr.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-09 09:51:39 +00:00
Włodzimierz Skiba
4e3e485bc8 Include wx/toolbar.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-07 17:46:13 +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
David Surovell
4d53859584 minor refactoring of menu UpdateUI handling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-11-30 07:59:38 +00:00
Mattia Barbon
dee1a63ff5 Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it. 
Changed default for WXWIN_COMPATIBILITY_2_4 to 0.
  Added WXWIN_COMPATIBILITY_2_6 (defaults to 1).
  Ran build/update-setup-h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-09 15:48: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
Włodzimierz Skiba
26c36d7505 Do not send event for already selected menu radio item selection. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-10 19:10:52 +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
adbc621dcb replaced a weird (and wrong when wxUSE_STL == 1) test for string being empty with empty() call (patch 1089458) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-01-31 22:08:33 +00:00
Włodzimierz Skiba
1729813a8d Old API clearly deprecated. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-01-05 19:25:02 +00:00
Robin Dunn
2b02216951 Give SendSizeEvent a generic implementation. It can be useful on 
non-MSW platforms as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-19 19:20:01 +00:00
Vadim Zeitlin
a4f01f0592 relayout frame contents when tool/statusbar is shown/hidden 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-01 01:49:45 +00:00
Włodzimierz Skiba
a62848fdba Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false, !!/!IsEmpty(). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-14 12:08:28 +00:00
Włodzimierz Skiba
f428e6c50f Warning fixes for WinCE. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-06-16 06:24:42 +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
45f272841c Fixes for Standard WinCE SDK 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-27 09:09:19 +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
Robert Roebling
7ef67c25ff Fix for white area above frame because of funky 
toolbar/menubar-mix implementation under eVC 3.0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-04-15 15:58:25 +00:00
Vadim Zeitlin
8f4d9fcd9a do take the toolbar into account for Windows CE, otherwise the menus overlap with the frame client area 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-04-04 22:37:11 +00:00
Dimitri Schoolwerth
d1b20379e4 Applied patch #876969: "Fixes to Borland warnings"; Minor code cleanup. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-27 22:30:13 +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
Vadim Zeitlin
96ac065f9e restore status bar text after a menu has been shown 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-10-07 22:55:06 +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
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
e2b6d07d7a Added call to top-level window OnInternalIdle 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-15 10:24:30 +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