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/trunk@25636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 3c3fa3a2ab4f916bcc9b8199b0af4068ff28d052..f665c110b97d21d746dc3e7612ed89a084e9a808 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1089,8 +1089,16 @@ enum wxBorder
 /*  Windows, it won't normally get the dialog navigation key events) */
 #define wxWANTS_CHARS           0x00040000
 
 /*  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
 #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 */
 #define wxBACKINGSTORE          wxRETAINED
 
 /*  set this flag to create a special popup window: it will be always shown on */