exposing wxOSXGetViewFromResponder

[wxWidgets.git] / src / msw / dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 3e54725e3a8e99d8aa2819c37f6dab76cf46a4fc..b8b73d252549f2f0ce0e499fa542adf4ae5c6628 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/dialog.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
@@ -194,14 +195,11 @@ bool wxDialog::Show(bool show)
     return true;
 }
 
-void wxDialog::Raise()
-{
-    ::SetForegroundWindow(GetHwnd());
-}
-
 // show dialog modally
 int wxDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );
 
     Show();
@@ -338,7 +336,7 @@ bool wxDialog::DoOK()
     if ( EmulateButtonClickIfPresent(idOk) )
         return true;
 
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+    wxCommandEvent event(wxEVT_BUTTON, GetAffirmativeId());
     event.SetEventObject(this);
 
     return HandleWindowEvent(event);
@@ -464,7 +462,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
     }
 
     if ( !processed )
-        rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+        rc = wxDialogBase::MSWWindowProc(message, wParam, lParam);
 
     return rc;
 }