changes wxFRAME_EX_CONTEXTHELP value to avoid clash with wxWS_EX_TRANSIENT

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 5ea5a2b7820ceeb1d584e7a42ca890df9628a5f0..0bf00a50dd6141b1b7e49ae25c7fbede3065683d 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -864,6 +864,11 @@ enum wxBorder
 // parent is destroyed before the child
 #define wxWS_EX_TRANSIENT               0x00000004
 
 // parent is destroyed before the child
 #define wxWS_EX_TRANSIENT               0x00000004
 

+// Use this style to add a context-sensitive help to the window (currently for
+// Win32 only and it doesn't work if wxMINIMIZE_BOX or wxMAXIMIZE_BOX are used)
+#define wxFRAME_EX_CONTEXTHELP  0x00000004
+#define wxDIALOG_EX_CONTEXTHELP 0x00000004
+

 /*
  * wxFrame/wxDialog style flags
  */
 /*
  * wxFrame/wxDialog style flags
  */


@@ -894,10 +899,6 @@ enum wxBorder
 // deprecated flag, don't use any more, defined for compatibility only
 #define wxFRAME_FLOAT_ON_PARENT 0
 
 // deprecated flag, don't use any more, defined for compatibility only
 #define wxFRAME_FLOAT_ON_PARENT 0
 

-// Context-sensitive help
-#define wxFRAME_EX_CONTEXTHELP  0x00000004
-#define wxDIALOG_EX_CONTEXTHELP 0x00000004
-

 /*
  * MDI parent frame style flags
  * Can overlap with some of the above.
 /*
  * MDI parent frame style flags
  * Can overlap with some of the above.