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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 32ff8acd0db6ee40f9097de3014930bd644b42ec..8e799611ff33c66f5f57b5328c2ec42cd74809d5 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -92,8 +92,6 @@ public:
     // override some base class virtuals
     virtual bool Show(bool show = true);
 
     // 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
 #if wxUSE_DIALOG_SIZEGRIP
     virtual void SetWindowStyleFlag(long style);
 #endif // wxUSE_DIALOG_SIZEGRIP

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 177bbb65b499a49633fd5130c6ce57972947a83e..2ea3ed670fdb50afd09a67209048e0b7249b1106 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -42,7 +42,6 @@ public:
 
     // implement base class pure virtuals
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 
     // implement base class pure virtuals
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);

-    virtual void Raise();

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index ec937af348f8a949702c599c7eebb5a835c21c85..e0a7453b680348c6b2913295f702d93ca9b6fe69 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -60,6 +60,7 @@ public:
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
     virtual bool Show(bool show = true);
     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);
 
     virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 3e54725e3a8e99d8aa2819c37f6dab76cf46a4fc..89d294e76021e4b98a2668d26bd7d97ee14c898d 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -194,11 +194,6 @@ bool wxDialog::Show(bool show)
     return true;
 }
 
     return true;
 }
 

-void wxDialog::Raise()
-{
-    ::SetForegroundWindow(GetHwnd());
-}
-

 // show dialog modally
 int wxDialog::ShowModal()
 {
 // show dialog modally
 int wxDialog::ShowModal()
 {

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 6fb620f44872f7e9ac3650f12f296a758cfee9af..40babb6805eb27a3027c0c1a60e3f61192a0f4da 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -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
 void wxFrame::SendSizeEvent(int flags)
 {
 // generate an artificial resize event
 void wxFrame::SendSizeEvent(int flags)
 {

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 7adf8c69259ef4b7c22d2bca98aae2ef7285fe43..51972423ad0f4e1328f6ed190371f0bf42d202ae 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -727,6 +727,11 @@ bool wxTopLevelWindowMSW::Show(bool show)
     return true;
 }
 
     return true;
 }
 

+void wxTopLevelWindowMSW::Raise()
+{
+    ::SetForegroundWindow(GetHwnd());
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW maximize/minimize
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW maximize/minimize
 // ----------------------------------------------------------------------------