Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No changes, just implement Raise() in wxTopLevelWindow in wxMSW.

Browse Source 
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:
Vadim Zeitlin
2012-02-05 14:18:22 +00:00
parent d4a762e30a
commit 7cee4f7621
6 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/dialog.h
View File

@@ -92,8 +92,6 @@ public:
// override some base class virtuals // override some base class virtuals
virtual bool Show(bool show = true); virtual bool Show(bool show = true);
virtual void Raise();
#if wxUSE_DIALOG_SIZEGRIP #if wxUSE_DIALOG_SIZEGRIP
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style);
#endif // wxUSE_DIALOG_SIZEGRIP #endif // wxUSE_DIALOG_SIZEGRIP

1
include/wx/msw/frame.h
View File

@@ -42,7 +42,6 @@ public:
// implement base class pure virtuals // implement base class pure virtuals
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual void Raise();
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------

1
include/wx/msw/toplevel.h
View File

@@ -60,6 +60,7 @@ public:
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
virtual bool Show(bool show = true); virtual bool Show(bool show = true);
virtual void Raise();
virtual void ShowWithoutActivating(); virtual void ShowWithoutActivating();
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);

5
src/msw/dialog.cpp
View File

@@ -194,11 +194,6 @@ bool wxDialog::Show(bool show)
return true; return true;
} }
void wxDialog::Raise()
{
::SetForegroundWindow(GetHwnd());
}
// show dialog modally // show dialog modally
int wxDialog::ShowModal() int wxDialog::ShowModal()
{ {

5
src/msw/frame.cpp
View File

@@ -239,11 +239,6 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
// wxFrame: various geometry-related functions // wxFrame: various geometry-related functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxFrame::Raise()
{
::SetForegroundWindow(GetHwnd());
}
// generate an artificial resize event // generate an artificial resize event
void wxFrame::SendSizeEvent(int flags) void wxFrame::SendSizeEvent(int flags)
{ {

5
src/msw/toplevel.cpp
View File

@@ -727,6 +727,11 @@ bool wxTopLevelWindowMSW::Show(bool show)
return true; return true;
} }
void wxTopLevelWindowMSW::Raise()
{
::SetForegroundWindow(GetHwnd());
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTopLevelWindowMSW maximize/minimize // wxTopLevelWindowMSW maximize/minimize
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------