unified wxFRAME_EX_CONTEXTHELP and wxDIALOG_EX_CONTEXTHELP in a single wxWS_EX_CONTEXTHELP and changed its value to avoid conflict with wxWS_EX_TRANSIENT (this resulted in all progress dialogs having useless context help button in their title bar)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1513,15 +1513,18 @@ enum wxBorder
|
||||
/* this window should always process UI update events */
|
||||
#define wxWS_EX_PROCESS_UI_UPDATES 0x00000020
|
||||
|
||||
/* 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
|
||||
|
||||
/* Draw the window in a metal theme on Mac */
|
||||
#define wxFRAME_EX_METAL 0x00000040
|
||||
#define wxDIALOG_EX_METAL 0x00000040
|
||||
|
||||
/* 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 wxWS_EX_CONTEXTHELP 0x00000080
|
||||
|
||||
/* synonyms for wxWS_EX_CONTEXTHELP for compatibility */
|
||||
#define wxFRAME_EX_CONTEXTHELP wxWS_EX_CONTEXTHELP
|
||||
#define wxDIALOG_EX_CONTEXTHELP wxWS_EX_CONTEXTHELP
|
||||
|
||||
/* Create a window which is attachable to another top level window */
|
||||
#define wxFRAME_DRAWER 0x0020
|
||||
|
||||
|
Reference in New Issue
Block a user