fix GetTLWParentIfNotBeingDeleted() to work correctly even if an intermediate non...

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 8d30e360194f0bed928e400009fa3a5d705818eb..4fce3f8d479dff61bf79002bca691849a1e51862 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -27,6 +27,7 @@
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcdlg.h"

     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"


@@ -41,8 +42,6 @@
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 

-#include "wx/msw/wrapcdlg.h"
-

 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/resources.h"
 #endif // __SMARTPHONE__ && __WXWINCE__
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/resources.h"
 #endif // __SMARTPHONE__ && __WXWINCE__


@@ -187,31 +186,6 @@ bool wxDialog::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-#if WXWIN_COMPATIBILITY_2_6
-
-// deprecated ctor
-wxDialog::wxDialog(wxWindow *parent,
-                   const wxString& title,
-                   bool WXUNUSED(modal),
-                   int x,
-                   int y,
-                   int w,
-                   int h,
-                   long style,
-                   const wxString& name)
-{
-    Init();
-
-    Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
-}
-
-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
-    // nothing to do, obsolete method
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-

 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;


@@ -224,15 +198,6 @@ wxDialog::~wxDialog()
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

-#if WXWIN_COMPATIBILITY_2_6
-
-bool wxDialog::IsModalShowing() const
-{
-    return IsModal();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-

 wxWindow *wxDialog::FindSuitableParent() const
 {
     // first try to use the currently active window
 wxWindow *wxDialog::FindSuitableParent() const
 {
     // first try to use the currently active window


@@ -272,6 +237,9 @@ bool wxDialog::Show(bool show)
 
     if ( show )
     {
 
     if ( show )
     {

+        if (CanDoLayoutAdaptation())
+            DoLayoutAdaptation();
+

         // this usually will result in TransferDataToWindow() being called
         // which will change the controls values so do it before showing as
         // otherwise we could have some flicker
         // this usually will result in TransferDataToWindow() being called
         // which will change the controls values so do it before showing as
         // otherwise we could have some flicker


@@ -384,7 +352,7 @@ bool wxDialog::DoOK()
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
     event.SetEventObject(this);
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
     event.SetEventObject(this);
 

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 #endif // __POCKETPC__
 
 }
 #endif // __POCKETPC__