1. a couple of compilation warnings fixed (strconv/listctrl)
2. now reenable windows disabled by wxWindowDisabler slightly earlier: this solves the problem with "wrong" window being brought to top and eliminates the need for BringWindowToTop() and SetActiveWindow() in our code 3. style wxFRAME_FLOAT_ON_PARENT is now obsolete and unused, all frames have WS_EX_APPWINDOW style and appear on the taskbar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -919,8 +919,8 @@ enum wxStretch
|
||||
#define wxDIALOG_MODAL 0x0020
|
||||
#define wxDIALOG_MODELESS 0x0000
|
||||
|
||||
// Add for normal Windows frame behaviour
|
||||
#define wxFRAME_FLOAT_ON_PARENT 0x0020
|
||||
// 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
|
||||
|
@@ -23,10 +23,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
|
||||
// Dialog boxes
|
||||
class WXDLLEXPORT wxDialog : public wxDialogBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxDialog)
|
||||
|
||||
public:
|
||||
wxDialog();
|
||||
wxDialog() { Init(); }
|
||||
|
||||
// Constructor with a modal flag, but no window id - the old convention
|
||||
wxDialog(wxWindow *parent,
|
||||
@@ -116,9 +114,17 @@ protected:
|
||||
// show modal dialog and enter modal loop
|
||||
void DoShowModal();
|
||||
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
private:
|
||||
wxWindow *m_oldFocus;
|
||||
|
||||
// while we are showing a modal dialog we disable the other windows using
|
||||
// this object
|
||||
class wxWindowDisabler *m_windowDisabler;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxDialog)
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
|
@@ -305,10 +305,6 @@ public:
|
||||
|
||||
private:
|
||||
wxWindowList *m_winDisabled;
|
||||
|
||||
#ifdef __WXMSW__
|
||||
wxWindow *m_winTop;
|
||||
#endif // MSW
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user