Commit Graph

32 Commits

Author SHA1 Message Date
Vadim Zeitlin
9be928d6fb Fix destruction of wxNativeContainerWindow in wxMSW.
WM_CLOSE was not processed at all for native windows wrapped by
wxNativeContainerWindow because we don't handle it ourselves at wxWindow level
but still mark it as processed in order to prevent DefWindowProc() from
destroying the window. Unfortunately this also prevented the original handler
for this message in the native window from being called.

Calling just the original handler and not the wxWidgets one is not ideal
neither but is much better as it allows to e.g. close MFC frames wrapped in
wxNativeContainerWindow whereas before this didn't work at all as WM_CLOSE was
completely ignored.

Also call the original handler for WM_DESTROY to avoid similar potential
problems with this message, even if it doesn't seem to create any with MFC.

Extend the mfc sample to show how a wxPanel can be embedded into the existing
CFrameWnd.
2015-07-09 20:49:05 +02:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
2015-04-23 22:00:35 +04:00
Vadim Zeitlin
a580f0b994 Remove unnecessary wxUSE_MFC option.
This didn't do (almost) anything, so just remove it, using MFC and wxWidgets
together works just fine without it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-12-16 20:16:16 +00:00
Paul Cornett
5b4a70247c use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 07:07:55 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
ed2da291ad Disable deprecation and other warnings in MFC sample.
VC8+ give tons of deprecation warnings for the standard functions which are
usually suppressed by wx headers but they need to be included first for the
suppression to be effective. In the MFC sample they were not resulting in many
useless warnings.

Fix this by pre-defining _CRT_SECURE_NO_WARNINGS to suppress them in the
sample itself.

Also suppress a warning about WINVER being undefined.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 13:39:24 +00:00
Vadim Zeitlin
0c9786de3a Fix entry point in Unicode build of the MFC sample.
MFC needs the entry point to be wWinMainCRTStartup() in Unicode builds but the
bakefile-generated projects use the default WinMain() so the sample didn't
link in Unicode.

Fix this by providing WinMain() which simply forwards to wWinMainCRTStartup()
as this seems to work for all MSVC/CRT versions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 13:39:16 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace.
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:44:45 +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
81d3348a9b replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:43:11 +00:00
Vadim Zeitlin
f1223c8d55 added a note about entry point in Unicode build (patch 1934836)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-06 16:01:01 +00:00
Vadim Zeitlin
9f4905aeef compilation fix + comment about bogus memory leak (patch 1849988)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 02:30:48 +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
bb2775b9e8 override ExitMainLoop() to exit the MFC main loop instead of wxWidgets one, otherwise the application hangs on exit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-01 21:53:30 +00:00
Julian Smart
ff96483989 Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 12:26:08 +00:00
Julian Smart
4d3923a7b0 More comments to help people build the MFC sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-16 12:33:50 +00:00
Vadim Zeitlin
cc3bb83d94 fixed quitting the sample; fixed memory leak of CDummyWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-30 23:05:53 +00:00
Vadim Zeitlin
885ebd2b32 fixed MFC sample (bug 978194)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-30 23:01:04 +00:00
Julian Smart
654c02dc23 Corrected strange test for __WINDOWS__ or wxUSE_MFC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-04 15:33:33 +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
Dimitri Schoolwerth
75d1935a0a clarified #error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-29 19:19:57 +00:00
Julian Smart
7818a75c16 Corrected copyright information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 13:41:00 +00:00
Julian Smart
2243113487 Further improvements to MFC sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 11:18:09 +00:00
Julian Smart
4cd513abbc MFC sample now works properly; WinMain not defined in wxMSW
if wxUSE_MFC is defined.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-17 10:52:10 +00:00
Vadim Zeitlin
2f6c54eb07 patch from Dimitri fixing a few memory leaks and unTABbing the sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-17 14:16:03 +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
Julian Smart
3f8e5072f7 Small fixes for Tex2RTF but alas, we still get memory problems.
Added wxUSE_MFC setting (doesn't include windows.h, removes own memory
tracing); added include <ctype.h> in case where PCH isn't used;
wxExit now exits :-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-10 11:18:22 +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
818e52c201 Changed GetForce -> !CanVeto
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-02-05 15:06:25 +00:00
Julian Smart
f5e5bd6607 Further changes to make mfctest work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-02-04 22:06:15 +00:00
Julian Smart
17b74d79ad Fixed compilation for when not including <windows.h>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-02-04 21:12:30 +00:00
Karsten Ballüder
bbf1f0e5cf now MSW stuff is complete
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-20 14:21:00 +00:00