No changes, just implement Raise() in wxTopLevelWindow in wxMSW.
Get rid of two identical implementations in wxFrame and wxDialog and only override this function once in wxTopLevelWindow. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -92,8 +92,6 @@ public:
|
||||
// override some base class virtuals
|
||||
virtual bool Show(bool show = true);
|
||||
|
||||
virtual void Raise();
|
||||
|
||||
#if wxUSE_DIALOG_SIZEGRIP
|
||||
virtual void SetWindowStyleFlag(long style);
|
||||
#endif // wxUSE_DIALOG_SIZEGRIP
|
||||
|
@@ -42,7 +42,6 @@ public:
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
|
||||
virtual void Raise();
|
||||
|
||||
// implementation only from now on
|
||||
// -------------------------------
|
||||
|
@@ -60,6 +60,7 @@ public:
|
||||
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
|
||||
|
||||
virtual bool Show(bool show = true);
|
||||
virtual void Raise();
|
||||
|
||||
virtual void ShowWithoutActivating();
|
||||
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
|
||||
|
@@ -194,11 +194,6 @@ bool wxDialog::Show(bool show)
|
||||
return true;
|
||||
}
|
||||
|
||||
void wxDialog::Raise()
|
||||
{
|
||||
::SetForegroundWindow(GetHwnd());
|
||||
}
|
||||
|
||||
// show dialog modally
|
||||
int wxDialog::ShowModal()
|
||||
{
|
||||
|
@@ -239,11 +239,6 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
|
||||
// wxFrame: various geometry-related functions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
void wxFrame::Raise()
|
||||
{
|
||||
::SetForegroundWindow(GetHwnd());
|
||||
}
|
||||
|
||||
// generate an artificial resize event
|
||||
void wxFrame::SendSizeEvent(int flags)
|
||||
{
|
||||
|
@@ -727,6 +727,11 @@ bool wxTopLevelWindowMSW::Show(bool show)
|
||||
return true;
|
||||
}
|
||||
|
||||
void wxTopLevelWindowMSW::Raise()
|
||||
{
|
||||
::SetForegroundWindow(GetHwnd());
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxTopLevelWindowMSW maximize/minimize
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user