From d72dcc19ceb79eab114ab78a1347e3d31301021b Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 8 Feb 2004 15:03:28 +0000 Subject: [PATCH] Fixed bug [ 865999 ] wxRETAINED windows appear blank on MSW. wxRETAINED defined to 0 on non-Motif platforms to avoid clash with wxPOPUP_WINDOW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index bbb1b4a9e9..61c5ca2d05 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -935,8 +935,16 @@ enum wxBorder // Windows, it won't normally get the dialog navigation key events) #define wxWANTS_CHARS 0x00040000 -// Make window retained (mostly Motif, I think) -- obsolete (VZ)? +/* Make window retained (Motif only, see src/generic/scrolwing.cpp) + * This is non-zero only under wxMotif, to avoid a clash with wxPOPUP_WINDOW + * on other platforms + */ + +#ifdef __WXMOTIF__ #define wxRETAINED 0x00020000 +#else +#define wxRETAINED 0x00000000 +#endif #define wxBACKINGSTORE wxRETAINED // set this flag to create a special popup window: it will be always shown on