Commit Graph

166 Commits

Author SHA1 Message Date
Vadim Zeitlin
cd60273b3d override TryValidator() in wxMDIParentFrame to implement forwarding of menu/toolbar events to the active child at wx level instead of forwarding the WM_COMMAND itself: this is better as it prevents the same event from being passed twice to wxApp fall back if a handler exists in the child frame but skips the event and also because the code is portable now and can be moved down to the base class; also call the base class TryValidator() from wxDocMDI classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-26 15:24:03 +00:00
Vadim Zeitlin
e61f95ea78 don't crash if we have no accelerators for the "Window" menu items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-29 12:51:38 +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
838e6ed707 no real changes, just small cleanup, in particular use more consistent variable names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-28 09:01:44 +00:00
Vadim Zeitlin
1483e5db8d refactor WM_COMMAND messages handling in MDI frames to avoid duplicating code unnecessarily and generally streamline it; added possibility to use custom menu commands in the "Window" menu and specifying accelerators for them now works too (show this in the sample); finally added standard ids for the MDI window menu commands
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-27 16:47:41 +00:00
Vadim Zeitlin
7e6d684052 add more wxUSE_MENUS guards
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-26 23:38:08 +00:00
Vadim Zeitlin
51181d2911 use a virtual function instead of wxDynamicCast(wxMDIParentFrame) in wxFrame code: this not only makes the code cleaner but should also remove the last dependency on MDI code when linking wx applications not using MDI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-26 23:18:47 +00:00
Vadim Zeitlin
6125428d54 disable the "Next" and "Previous" commands in the window menu if we have a single child only; update the copyright
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-26 22:55:25 +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
d9698bd4ac cleanup the Win32 window classes registration code: remove global variables and register the window classes we use on demand to avoid registering MDI or GL classes unnecessarily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-29 22:19:55 +00:00
Vadim Zeitlin
d2824cdb7f Review/simplify/cleanup MDI classes for all platforms and introduce base
classes for wxMDI{Parent,Child}Frame and wxMDIClientWindow.

Also use generic MDI implementation for wxMotif as it seems to be more
functional and definitely is more maintained (we probably should use the
generic version for wxGTK too).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-04 02:46:19 +00:00
Vadim Zeitlin
ecc63060e7 show the "Window" menu only when we have any MDI children, it's unnecessary otherwise; some minor formatting/comments changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-04 12:47:53 +00:00
Vadim Zeitlin
6ad7799c0b don't use deprecated wxIconizeEvent::Iconized()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-24 23:42:43 +00:00
Vadim Zeitlin
8a0dce9cd0 fix handling of the commands with negative ids (e.g. created by NewControlId()) in MDI frames
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-17 23:53:11 +00:00
Vadim Zeitlin
936f635341 rename fobr95.{cpp,h} files to foobar.{cpp,h}
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-15 16:53:06 +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
55ae15512c add GetMDIParent() and use it to reduce the number of casts in the MDI code (patch 1885462)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-09 23:37:07 +00:00
Vadim Zeitlin
cf2810aa39 use wxWindowIDRef to transparently implement auto-generated ids ref-counting (slightly modified patch 1835458)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-06 14:38:44 +00:00
Václav Slavík
937013e0fd 1. added wxEvtHandler::SafelyProcessEvent() and wxWindow::HandleWindowEvent() to correctly handle exceptions in even handlers in wxGTK
2. use HandleWindowEvent() everywhere as more obvious and convenient shortcut for GetEventHandler()->ProcessEvent(); also for consistency with wxGTK where it's required

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-29 17:00:58 +00:00
Vadim Zeitlin
6756a5f8ee return int from wxGetWindowId(), not WORD, to ensure comparing it with wxWindowID elsewhere works correctly even for negative ids
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-23 02:03:15 +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
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
0d7c4404ac don't give debug messages about WM_MDISETMENU failure if there was no error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-18 16:33:10 +00:00
Vadim Zeitlin
b38e5da178 don't dereference NULL parent in wxMDIChildFrame dtor if it hadn't been really created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-18 16:27:25 +00:00
Vadim Zeitlin
3e85709e97 fix wxMDIChidFrame::GetPosition() (patch 1626610)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:42:00 +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
59cf2e4999 Include wx/mdi.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-08 20:19:29 +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
Paul Cornett
4fab51ddff unused variables/declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-07 01:17:16 +00:00
Vadim Zeitlin
05ae668ce4 use SubclassWin() insteaf of just wxAssociateWinWithHandle() to make sure we generate wxWindowCreateEvents for MDI frames (see patch 1411774)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-06 22:35:55 +00:00
Włodzimierz Skiba
1c067fe3c1 Removed every usage of obsolete wxTLW flags. 2.6 compatibility markup for them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 18:07:22 +00:00
Vadim Zeitlin
59abfcf813 removed code refreshing toolbar on every MDI child move -- no idea why was it there (since rev 1.1) but it results in horrible flicker and removing it doesn't seem to do any harm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 15:41:45 +00:00
Vadim Zeitlin
5bee6b2be4 set the same background colour for wxMDIParentFrame as for wxFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 15:38:20 +00:00
Włodzimierz Skiba
521bf4ff3e Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 16:50:23 +00:00
Vadim Zeitlin
1ac7660914 extracted wxFrame::MSWTranslateMessage() implementation into new MSWDoTranslateMessage so that it can be reused by wxMDIChildFrame; this allows to pass the correct window to ::TranslateAccelerator() and fix UI updating of the MDI child menu items (bug 1214439)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 16:38:07 +00:00
Vadim Zeitlin
e45a688549 refresh the MDI frame window menu whenever a child frame is shown/hidden (and not only when its menu bar is changed as this means that the menu is never refreshed if the child frame has no menu)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 01:14:45 +00:00
Vadim Zeitlin
90392f9cc9 removed Win16 code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 01:05:52 +00:00
Włodzimierz Skiba
a71d815bbe __WIN95__ removed (used to differ win3.1 vs. 'modern' 95 look, nowadays always defined for WXMSW so useless). Minor cleanings and corrections for correct #includes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 10:47:44 +00:00
Julian Smart
7dbe942aaa Fixed MDI context menu event handling problem (Stefan Kowski)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-16 14:52:57 +00:00
Kevin Hock
6fa30495b5 Fix MDI child windows not becoming active when created after changes to wxTopLevelWindow; BringWindowToTop added to wxMDIChildFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 05:00:32 +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
e27d9a9106 Reuse functionality of wxGetStockLabel().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-16 20:23:04 +00:00
Michael Wetherell
4d931bcca0 Translate '&Help' to '&' for italian Windows only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-12 15:29:57 +00:00
Vadim Zeitlin
6bbe97b71d force update of MDI client window size after the MDI parent frame is iconized and restored, otherwise all kinds of bad things (changes in MDI children positions; possibility to move them above the toolbar and below the status bar; wrong repaining) happen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-11 13:24:56 +00:00
Chris Elliott
e3307dddec wxMDIChildFrame::DetachMenuBar() to fix SF bug 1232271
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-29 13:41:49 +00:00
Włodzimierz Skiba
92218ce600 [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 17:13:46 +00:00
Chris Elliott
70e6f53a4a fix SF Bug 1232271
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-04 15:51:41 +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
Julian Smart
1696dde5fd Test for x, y in GetPosition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-22 14:23:22 +00:00
Chris Elliott
31f658e477 remove erroneous comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-24 13:23:53 +00:00