Commit Graph

71 Commits

Author SHA1 Message Date
Vadim Zeitlin
4f7cd56c14 don't duplicate menu creation code in the parent and child frames
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-28 09:00:49 +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
9089cffbf5 test ShowFullScreen() to verify that restoring menu works correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-26 23:17:09 +00:00
Vadim Zeitlin
9298a1c2ac use a slightly less ugly way to conditionally suppress unused parameter warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-09 13:36:23 +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
Chris Elliott
1583600031 fixes as per http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/92325
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-10 07:44:34 +00:00
Vadim Zeitlin
bacbf21352 we don't need status bar in the MDI children
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-18 17:29:16 +00:00
Vadim Zeitlin
45e6e6f8ab call OnInit() from all samples to allow using standard command line options with all of them (patch 1623971)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-04 00:34:18 +00:00
Vadim Zeitlin
ea7fb468ce include correct XPMs (Unix compilation fix after last commit)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-18 00:08:27 +00:00
Vadim Zeitlin
e21d861412 Some sample cleanup:
1. Use standard sample icon, avoid badly looking #ifdef __WXMSW__s
2. Use "modern" (i.e. this century) wxToolBar API, simplify code by
   not allocating the bitmaps on the heap and deleting them any more


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-17 15:04:05 +00:00
Włodzimierz Skiba
37f66b047e Use same type in both results of A?B:C operator (Tinderbox build fix).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-25 06:48:03 +00:00
Vadim Zeitlin
c9f856af67 added code to test UI updating of menu items in MDI apps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-24 13:36:22 +00:00
Włodzimierz Skiba
4219b5e7c7 Code cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 16:05:58 +00:00
Vadim Zeitlin
290c74fbed just added wxUSE_MENUS around code using the menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 01:12:49 +00:00
Vadim Zeitlin
c3b7706c4f don't override OnIconized() in the sample, the bug this was working around is now fixed in wxMSW itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-11 13:29:28 +00:00
Chris Elliott
77380b5cba fix SF bug 1236365 (tested in VC only)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-27 08:49:08 +00:00
Włodzimierz Skiba
422d0ff0be wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 10:09:47 +00:00
Włodzimierz Skiba
8520f1374c Fixes for wxUSE_STATUSBAR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-19 15:36:01 +00:00
Chris Elliott
a4f1a5f286 fix bug with button doing nothing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-23 16:04:10 +00:00
Włodzimierz Skiba
eb839c8423 -1->wxID_ANY, wxDefaultSize, wxDefaultPosition, TRUE->true and FALSE->false replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-01 16:09:27 +00:00
Julian Smart
be5a51fb59 More name changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 11:20:37 +00:00
David Elliott
9fa453eca5 Include mondrian.xpm for _all_ platforms except wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 18:36:49 +00:00
David Elliott
6ceba1749e Wrap ToolBar stuff with #if wxUSE_TOOLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 18:33:09 +00:00
Julian Smart
5f58391f70 Removed warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 07:18:26 +00:00
Julian Smart
6aa89a22b8 Fixed copyrights and licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:55:54 +00:00
Mattia Barbon
42ed75321c More samples/Unicode fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 10:23:11 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Julian Smart
a9c824e90f OnSize must not be skipped for non-wxX11 platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-22 15:44:34 +00:00
Julian Smart
b9f933ab5d Applied patch [ 597398 ] Generic MDI, wxNotebook based.
By Hans Van Leemputten (hansvl)

- This patch implements a generic notebook based mdi,
due to that wxMDIChildFrame could not derive from
wxFrame some things in the samples and in the docmdi
classes needed to be adjusted... basically this comes
down to not do (wxFrame *) but instead do
(wxMDIChildFrame *), or store a pointer to the frame in a
wxWindow* instead of a wxFrame variable...

- The main reason wxMDIChildFrame cannot derive from
wxFrame is that it would take to much platform specific
functions to be overwritten (= lot of ifdef's). This then
couldn't be called generic anymore, so that's why we
need to derive from wxPanel...

- Tested on/with:
1. wxMSW (I disabled the MSW MDI implementation to
be able to test it), tested it with the MDI sample,
docvwmdi sample and docview sample and also tested it
with wxWorkshop. (test = compile and run)
2. wxX11, tested with the same set wxWin samples as
the wxMSW test. I also compiled wxWorkshop with it,
but could not run wxWorkshop due to some issue not
related to the MDI implementation.

- How to apply:
* Apply the patch
* move mdig.cpp into wxWindows/src/generic/
* move mdig.h into wxWindows/include/wx/generic/

- Some extra things that still need to be done:
* File lists, project files should be updated to include
mdig.cpp (the patch only change this on wxX11)
* The configuration script should be updated.
* Maybe wxUSE_GENERIC_MDI_ARCHITECTURE also
should be added so it is only included when wanted...




git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-20 09:09:55 +00:00
Chris Elliott
d04d32c4ec removing bitmaps from mdi sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-12 11:56:01 +00:00
Julian Smart
618f2efa41 Added __WXX11__ tests where appropriate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-21 10:32:18 +00:00
Gilles Depeyrot
012f2cb251 use "..." instead of <...> for wx includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-19 14:50:37 +00:00
Mattia Barbon
4693b20c75 Unicode compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-21 20:21:44 +00:00
Vadim Zeitlin
3ebcfb769f applied patch #428104 (SetSizeHints() for wxMDIChildFrame)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-16 01:36:35 +00:00
Gilles Depeyrot
e70d4ce8d6 updated CodeWarrior projects for latest wxMac commits
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-09 21:01:26 +00:00
Vadim Zeitlin
fa762db4ed fixed compilation problems (mismatch between header and cpp)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 15:50:03 +00:00
Robert Roebling
47c93b637e Applied colour patch for better 8-bit support,
Improved handling of inserting controls into
    a toolbar that don't have any def width. This
    works for all controls but wxComboBox.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-16 12:27:26 +00:00
Vadim Zeitlin
3d8dea7e2e merged in the small changes from the 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-10 12:04:19 +00:00
Vadim Zeitlin
2fb40b2cd2 create dialog with !NULL parent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-10-11 12:55:38 +00:00
Vadim Zeitlin
5a2762f083 fixed MDI accel bug, more tests for it in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-10-10 13:55:10 +00:00
Jouk Jansen
2f20fe2222 Committing in .
Modified Files:
 	wxWindows/samples/mdi/mdi.cpp

 VMS patch

----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-25 09:22:41 +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
c41ea66a5d 1. corrected bug in MDI sample (which resulted in missing horz scrollbar)
2. wxRegKey::Rename() added, regtest sample shows copying/moving/renaming keys
   and values now
3. using wxLog() insread of WriteText() contorsions in the listctrl sample,
   show client data from events in the log messages


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-24 23:40:42 +00:00
Julian Smart
df61c00971 Set/GetWindowMenu added to MDI parent frame under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-01 15:48:44 +00:00
Vadim Zeitlin
74b31181b3 1. Implemented support for different icons for different states (expanded,
selected, combination of them) for the tree control (and doc'd it)
2. removed code which was sending extra event if wxFrame::SetSize() was
   used
3. important changes to wxWizard interface
4. small compilation corrections


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-29 22:47:56 +00:00
Robert Roebling
ddb6bc7126 A bit more Unicode compilation.
Window insertion corrections for window, frame, dialog, mdi.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-05-30 16:20:42 +00:00
Vadim Zeitlin
c52d95b412 more MDI features tested
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-05-23 23:45:47 +00:00
Julian Smart
e306597309 Removed lots of OnClose functions; doc'ed OnCloseWindow better;
MM_... -> wxMM_...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-02-05 23:55:04 +00:00
Julian Smart
054d497f28 Corrected thread.h inline problem. Set WXWIN_COMPATIBILITY to 0 by default in wxMSW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-01-11 16:05:33 +00:00
Julian Smart
3fd16e6c58 Updated frame style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-12-15 18:01:22 +00:00