reverted last commit, still broken for VC6

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 8c3f4e9afaea005fa64323bc60ca10883900807b..32678cc5781d2020eda1385eefa72501c6f39e0b 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -1,600 +1,420 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/msw/dialog.cpp

 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "dialog.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/dialog.h"
-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+    #include "wx/dialog.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/app.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 #endif
 
 #include "wx/msw/private.h"
 #include "wx/log.h"

+#include "wx/evtloop.h"
+#include "wx/ptr_scpd.h"

 
 

-#if wxUSE_COMMON_DIALOGS
-#include <commdlg.h>
-#endif
-
-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
-
-// Lists to keep track of windows, so we can disable/enable them
-// for modal dialogs
-wxWindowList wxModalDialogs;
-wxWindowList wxModelessWindows;  // Frames and modeless dialogs
-extern wxList WXDLLEXPORT wxPendingDelete;
-
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
-
-    BEGIN_EVENT_TABLE(wxDialog, wxPanel)
-        EVT_SIZE(wxDialog::OnSize)
-        EVT_BUTTON(wxID_OK, wxDialog::OnOK)
-        EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
-        EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
-        EVT_CHAR_HOOK(wxDialog::OnCharHook)
-        EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-        EVT_CLOSE(wxDialog::OnCloseWindow)
-    END_EVENT_TABLE()
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
+    #include <commdlg.h>

 #endif
 
 #endif
 

-wxDialog::wxDialog()
-{
-  m_isShown = FALSE;
-  m_modalShowing = FALSE;
-
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-}
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    #include "wx/msw/wince/resources.h"
+#endif // __SMARTPHONE__ && __WXWINCE__
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxDialogStyle )
+
+wxBEGIN_FLAGS( wxDialogStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxNO_BORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+
+    // dialog styles
+    wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
+    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
+    wxFLAGS_MEMBER(wxCAPTION)
+    wxFLAGS_MEMBER(wxTHICK_FRAME)
+    wxFLAGS_MEMBER(wxSYSTEM_MENU)
+    wxFLAGS_MEMBER(wxRESIZE_BORDER)
+    wxFLAGS_MEMBER(wxRESIZE_BOX)
+    wxFLAGS_MEMBER(wxCLOSE_BOX)
+    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
+    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
+wxEND_FLAGS( wxDialogStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxDialog)
+    wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxDialog)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)

 
 

-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
-                      const wxString& title,
-                      const wxPoint& pos,
-                      const wxSize& size,
-                      long style,
-                      const wxString& name)
-{
-#if wxUSE_TOOLTIPS
-    m_hwndToolTip = 0;
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

 #endif
 
 #endif
 

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    SetName(name);
-
-    if (!parent)
-        wxTopLevelWindows.Append(this);
-
-    //  windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-
-    if (x < 0) x = wxDIALOG_DEFAULT_X;
-    if (y < 0) y = wxDIALOG_DEFAULT_Y;
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
+    EVT_BUTTON(wxID_OK, wxDialog::OnOK)
+    EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
+    EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)

 
 

-    m_windowStyle = style;
+    EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)

 
 

-    m_isShown = FALSE;
-    m_modalShowing = FALSE;
+    EVT_CLOSE(wxDialog::OnCloseWindow)
+END_EVENT_TABLE()

 
 

-    if (width < 0)
-        width = 500;
-    if (height < 0)
-        height = 500;
-
-    // All dialogs should really have this style
-    m_windowStyle |= wxTAB_TRAVERSAL;
-
-    WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
-    if (m_windowStyle & wxSTAY_ON_TOP)
-        extendedStyle |= WS_EX_TOPMOST;
-
-    // Allows creation of dialogs with & without captions under MSWindows,
-    // resizeable or not (but a resizeable dialog always has caption -
-    // otherwise it would look too strange)
-    const wxChar *dlg;
-    if ( style & wxRESIZE_BORDER )
-        dlg = T("wxResizeableDialog");
-    else if ( style & wxCAPTION )
-        dlg = T("wxCaptionDialog");
-    else
-        dlg = T("wxNoCaptionDialog");
-    MSWCreate(m_windowId, parent, NULL, this, NULL,
-              x, y, width, height,
-              0, // style is not used if we have dlg template
-              dlg,
-              extendedStyle);
+// ----------------------------------------------------------------------------
+// wxDialogModalData
+// ----------------------------------------------------------------------------

 
 

-    HWND hwnd = (HWND)GetHWND();
+// this is simply a container for any data we need to implement modality which
+// allows us to avoid changing wxDialog each time the implementation changes
+class wxDialogModalData
+{
+public:
+    wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { }

 
 

-    if ( !hwnd )
+    void RunLoop()

     {
     {

-        wxLogError(_("Failed to create dialog."));
+        m_evtLoop.Run();
+    }

 
 

-        return FALSE;
+    void ExitLoop()
+    {
+        m_evtLoop.Exit();

     }
 
     }
 

-    SubclassWin(GetHWND());
+private:
+    wxModalEventLoop m_evtLoop;
+};

 
 

-    SetWindowText(hwnd, title);
-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);

 
 

-    return TRUE;
-}
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-void wxDialog::SetModal(bool flag)
+// ----------------------------------------------------------------------------
+// wxDialog construction
+// ----------------------------------------------------------------------------
+
+void wxDialog::Init()

 {
 {

-  if ( flag )
-    m_windowStyle |= wxDIALOG_MODAL ;
-  else
-    if ( m_windowStyle & wxDIALOG_MODAL )
-        m_windowStyle -= wxDIALOG_MODAL ;
-
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
+    m_oldFocus = (wxWindow *)NULL;
+    m_isShown = false;
+    m_modalData = NULL;
+    m_endModalCalled = false;

 }
 
 }
 

-wxDialog::~wxDialog()
+bool wxDialog::Create(wxWindow *parent,
+                      wxWindowID id,
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxString& name)

 {
 {

-  m_isBeingDeleted = TRUE;
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
 

-  wxTopLevelWindows.DeleteObject(this);
+    // save focus before doing anything which can potentially change it
+    m_oldFocus = FindFocus();

 
 

-  Show(FALSE);
+    // All dialogs should really have this style
+    style |= wxTAB_TRAVERSAL;

 
 

-  if (m_modalShowing)
-  {
-    // For some reason, wxWindows can activate another task altogether
-    // when a frame is destroyed after a modal dialog has been invoked.
-    // Try to bring the parent to the top.
-    // dfgg: I moved this following line from end of function -
-    //       must not call if another window is on top!!
-    //       This can often happen with Close() and delayed deleting
-    if (GetParent() && GetParent()->GetHWND())
-      ::BringWindowToTop((HWND) GetParent()->GetHWND());
-  }
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return false;

 
 

-  m_modalShowing = FALSE;
+    if ( !m_hasFont )
+        SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-  if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-    wxModelessWindows.DeleteObject(this);
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

 
 

-  // If this is the last top-level window, exit.
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    SetLeftMenu(wxID_OK, _("OK"));
+#endif

 
 

-    if (wxTheApp->GetExitOnFrameDelete())
-    {
-       PostQuitMessage(0);
-    }
-  }
+    return true;

 }
 
 }
 

-// By default, pressing escape cancels the dialog
-void wxDialog::OnCharHook(wxKeyEvent& event)
+// 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)

 {
 {

-  if (GetHWND())
-  {
-    if (event.m_keyCode == WXK_ESCAPE)
-    {
-        // Behaviour changed in 2.0: we'll send a Cancel message
-        // to the dialog instead of Close.
-        wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-        cancelEvent.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(cancelEvent);
+    Init();

 
 

-        return;
-    }
-  }
-  // We didn't process this event.
-  event.Skip();
+    Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);

 }
 
 }
 

-void wxDialog::OnPaint(wxPaintEvent& event)
+void wxDialog::SetModal(bool WXUNUSED(flag))

 {
 {

-  // No: if you call the default procedure, it makes
-  // the following painting code not work.
-//  wxWindow::OnPaint(event);
+    // nothing to do, obsolete method

 }
 
 }
 

-void wxDialog::Fit()
+wxDialog::~wxDialog()

 {
 {

-  wxWindow::Fit();
-}
+    m_isBeingDeleted = true;

 
 

-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-  // Windows dialog boxes can't be iconized
+    // this will also reenable all the other windows for a modal dialog
+    Show(false);

 }
 
 }
 

-bool wxDialog::IsIconized() const
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------
+
+bool wxDialog::IsModalShowing() const

 {
 {

-  return FALSE;
+    return IsModal();

 }
 
 }
 

-void wxDialog::DoSetClientSize(int width, int height)
+wxWindow *wxDialog::FindSuitableParent() const

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  RECT rect;
-  ::GetClientRect(hWnd, &rect);
-
-  RECT rect2;
-  GetWindowRect(hWnd, &rect2);
-
-  // Find the difference between the entire window (title bar and all)
-  // and the client area; add this to the new client size to move the
-  // window
-  int actual_width = rect2.right - rect2.left - rect.right + width;
-  int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
+    // first try to use the currently active window
+    HWND hwndFg = ::GetForegroundWindow();
+    wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
+                              : NULL;
+    if ( !parent )
+    {
+        // next try the main app window
+        parent = wxTheApp->GetTopWindow();
+    }

 
 

-  MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE);
+    // finally, check if the parent we found is really suitable
+    if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
+    {
+        // don't use this one
+        parent = NULL;
+    }

 
 

-  wxSizeEvent event(wxSize(actual_width, actual_height), m_windowId);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+    return parent;

 }
 
 }
 

-void wxDialog::GetPosition(int *x, int *y) const
+bool wxDialog::Show(bool show)

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  RECT rect;
-  GetWindowRect(hWnd, &rect);
+    if ( show == IsShown() )
+        return false;

 
 

-  *x = rect.left;
-  *y = rect.top;
-}
+    if ( !show && m_modalData )
+    {
+        // we need to do this before calling wxDialogBase version because if we
+        // had disabled other app windows, they must be reenabled right now as
+        // if they stay disabled Windows will activate another window (one
+        // which is enabled, anyhow) when we're hidden in the base class Show()
+        // and we will lose activation
+        m_modalData->ExitLoop();
+    }

 
 

-bool wxDialog::IsShown() const
-{
-  return m_isShown;
+    if ( show )
+    {
+        // 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
+        InitDialog();
+    }
+
+    wxDialogBase::Show(show);
+
+    if ( show )
+    {
+        // dialogs don't get WM_SIZE message after creation unlike most (all?)
+        // other windows and so could start their life non laid out correctly
+        // if we didn't call Layout() from here
+        //
+        // NB: normally we should call it just the first time but doing it
+        //     every time is simpler than keeping a flag
+        Layout();
+    }
+
+    return true;

 }
 
 }
 

-bool wxDialog::IsModal() const
+void wxDialog::Raise()

 {
 {

-    return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast
+    ::SetForegroundWindow(GetHwnd());

 }
 
 }
 

-bool wxDialog::Show(bool show)
+// show dialog modally
+int wxDialog::ShowModal()

 {
 {

-  m_isShown = show;
+    wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );

 
 

-  if (show)
-    InitDialog();
+    m_endModalCalled = false;

 
 

-  bool modal =  ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL) ;
-
-#if WXGARBAGE_COLLECTION_ON /* MATTHEW: GC */
-  if (!modal) {
-    if (show) {
-      if (!wxModelessWindows.Find(this))
-        wxModelessWindows.Append(this);
-    } else
-      wxModelessWindows.DeleteObject(this);
-  }
-  if (show) {
-    if (!wxTopLevelWindows.Find(this))
-      wxTopLevelWindows.Append(this);
-  } else
-    wxTopLevelWindows.DeleteObject(this);
-#endif
+    Show();

 
 

-  if (modal)
-  {
-    if (show)
+    // EndModal may have been called from InitDialog handler (called from
+    // inside Show()), which would cause an infinite loop if we didn't take it
+    // into account
+    if ( !m_endModalCalled )

     {
     {

-      // find the top level window which had focus before - we will restore
-      // focus to it later
-      m_hwndOldFocus = 0;
-      for ( HWND hwnd = ::GetFocus(); hwnd; hwnd = ::GetParent(hwnd) )
-      {
-        m_hwndOldFocus = (WXHWND)hwnd;
-      }
-
-      if (m_modalShowing)
-      {
-        BringWindowToTop((HWND) GetHWND());
-        return TRUE;
-      }
-
-      m_modalShowing = TRUE;
-      wxNode *node = wxModalDialogs.First();
-      while (node)
-      {
-        wxDialog *box = (wxDialog *)node->Data();
-        if (box != this)
-          ::EnableWindow((HWND) box->GetHWND(), FALSE);
-        node = node->Next();
-      }
-
-      // if we don't do it, some window might be deleted while we have pointers
-      // to them in our disabledWindows list and the program will crash when it
-      // will try to reenable them after the modal dialog end
-      wxTheApp->DeletePendingObjects();
-      wxList disabledWindows;
-
-      node = wxModelessWindows.First();
-      while (node)
-      {
-        wxWindow *win = (wxWindow *)node->Data();
-        if (::IsWindowEnabled((HWND) win->GetHWND()))
+        // modal dialog needs a parent window, so try to find one
+        wxWindow *parent = GetParent();
+        if ( !parent )

         {
         {

-          ::EnableWindow((HWND) win->GetHWND(), FALSE);
-          disabledWindows.Append(win);
+            parent = FindSuitableParent();

         }
         }

-        node = node->Next();
-      }
-
-      ShowWindow((HWND) GetHWND(), SW_SHOW);
-      EnableWindow((HWND) GetHWND(), TRUE);
-      BringWindowToTop((HWND) GetHWND());
-
-      if ( !wxModalDialogs.Find(this) )
-        wxModalDialogs.Append(this);
-
-      MSG msg;
-      // Must test whether this dialog still exists: we may not process
-      // a message before the deletion.
-      while (wxModalDialogs.Find(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
-      {
-        if ( m_acceleratorTable.Ok() &&
-             ::TranslateAccelerator((HWND)GetHWND(),
-                                     (HACCEL)m_acceleratorTable.GetHACCEL(),
-                                     &msg) )
-        {
-            // Have processed the message
-        }
-        else if ( !wxTheApp->ProcessMessage((WXMSG *)&msg) )
+
+        // remember where the focus was
+        wxWindow *oldFocus = m_oldFocus;
+        if ( !oldFocus )

         {
         {

-          TranslateMessage(&msg);
-          DispatchMessage(&msg);
+            // VZ: do we really want to do this?
+            oldFocus = parent;

         }
 
         }
 

-        // If we get crashes (as per George Tasker's message) with nested modal dialogs,
-        // we should try removing the m_modalShowing test
+        // We have to remember the HWND because we need to check
+        // the HWND still exists (oldFocus can be garbage when the dialog
+        // exits, if it has been destroyed)
+        HWND hwndOldFocus = oldFocus ? GetHwndOf(oldFocus) : NULL;

 
 

-        if (m_modalShowing && !::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE))
-        // dfgg: NB MUST test m_modalShowing again as the message loop could have triggered
-        //       a Show(FALSE) in the mean time!!!
-        // Without the test, we might delete the dialog before the end of modal showing.
-        {
-                while (wxTheApp->ProcessIdle() && m_modalShowing)
-                {
-                    // Keep going until we decide we've done enough
-                }
-         }
-      }
-      // dfgg: now must specifically re-enable all other app windows that we disabled earlier
-      node=disabledWindows.First();
-      while(node) {
-        wxWindow* win = (wxWindow*) node->Data();
-        if (wxModalDialogs.Find(win) || wxModelessWindows.Find(win))
+
+        // enter and run the modal loop

         {
         {

-          HWND hWnd = (HWND) win->GetHWND();
-          if (::IsWindow(hWnd))
-            ::EnableWindow(hWnd,TRUE);
+            wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                               new wxDialogModalData(this));
+            modalData->RunLoop();

         }
         }

-        node=node->Next();
-      }
-    }
-    else // !show
-    {
-      ::SetFocus((HWND)m_hwndOldFocus);
-
-      wxModalDialogs.DeleteObject(this);
-
-      wxNode *last = wxModalDialogs.Last();
-
-      // If there's still a modal dialog active, we
-      // enable it, else we enable all modeless windows
-      if (last)
-      {
-          // VZ: I don't understand what this is supposed to do, so I'll leave
-          //     it out for now and look for horrible consequences
-        wxDialog *box = (wxDialog *)last->Data();
-        HWND hwnd = (HWND) box->GetHWND();
-#if 0
-        if (box->IsUserEnabled())
-#endif // 0
-          EnableWindow(hwnd, TRUE);
-        BringWindowToTop(hwnd);
-      }
-      else
-      {
-        wxNode *node = wxModelessWindows.First();
-        while (node)
+
+
+        // and restore focus
+        // Note that this code MUST NOT access the dialog object's data
+        // in case the object has been deleted (which will be the case
+        // for a modal dialog that has been destroyed before calling EndModal).
+        if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus))

         {
         {

-          wxWindow *win = (wxWindow *)node->Data();
-          HWND hwnd = (HWND) win->GetHWND();
-          // Only enable again if not user-disabled.
-#if 0
-          if (win->IsUserEnabled())
-#endif // 0
-            EnableWindow(hwnd, TRUE);
-          node = node->Next();
+            // This is likely to prove that the object still exists
+            if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+                oldFocus->SetFocus();

         }
         }

-      }
-      // Try to highlight the correct window (the parent)
-      HWND hWndParent = 0;
-      if (GetParent())
-      {
-        hWndParent = (HWND) GetParent()->GetHWND();
-        if (hWndParent)
-          ::BringWindowToTop(hWndParent);
-      }
-      ShowWindow((HWND) GetHWND(), SW_HIDE);
-      m_modalShowing = FALSE;
-    }
-  }
-  else // !modal
-  {
-    if (show)
-    {
-      ShowWindow((HWND) GetHWND(), SW_SHOW);
-      BringWindowToTop((HWND) GetHWND());

     }
     }

-    else
-    {
-      // Try to highlight the correct window (the parent)
-      HWND hWndParent = 0;
-      if (GetParent())
-      {
-        hWndParent = (HWND) GetParent()->GetHWND();
-        if (hWndParent)
-          ::BringWindowToTop(hWndParent);
-      }
-      ShowWindow((HWND) GetHWND(), SW_HIDE);
-    }
-  }
-  return TRUE;
-}

 
 

-void wxDialog::SetTitle(const wxString& title)
-{
-  SetWindowText((HWND) GetHWND(), title.c_str());
-}
-
-wxString wxDialog::GetTitle() const
-{
-  GetWindowText((HWND) GetHWND(), wxBuffer, 1000);
-  return wxString(wxBuffer);
+    return GetReturnCode();

 }
 
 }
 

-void wxDialog::Centre(int direction)
+void wxDialog::EndModal(int retCode)

 {
 {

-  int x_offset,y_offset ;
-  int display_width, display_height;
-  int  width, height, x, y;
-  wxWindow *parent = GetParent();
-  if ((direction & wxCENTER_FRAME) && parent)
-  {
-      parent->GetPosition(&x_offset,&y_offset) ;
-      parent->GetSize(&display_width,&display_height) ;
-  }
-  else
-  {
-    wxDisplaySize(&display_width, &display_height);
-    x_offset = 0 ;
-    y_offset = 0 ;
-  }
+    wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );

 
 

-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+    m_endModalCalled = true;
+    SetReturnCode(retCode);

 
 

-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
-
-  SetSize(x+x_offset, y+y_offset, width, height);
+    Hide();

 }
 
 }
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
-int wxDialog::ShowModal()
+void wxDialog::EndDialog(int rc)

 {
 {

-  m_windowStyle |= wxDIALOG_MODAL;
-  Show(TRUE);
-  return GetReturnCode();
+    if ( IsModal() )
+        EndModal(rc);
+    else
+        Hide();

 }
 
 }
 

-void wxDialog::EndModal(int retCode)
-{
-  SetReturnCode(retCode);
-  Show(FALSE);
-}
-
-// Define for each class of dialog and control
-WXHBRUSH wxDialog::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-      WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if wxUSE_CTL3D
-  HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-  return (WXHBRUSH) hbrush;
-#else
-  return 0;
-#endif
-}
+// ----------------------------------------------------------------------------
+// wxWin event handlers
+// ----------------------------------------------------------------------------

 
 // Standard buttons
 
 // Standard buttons

-void wxDialog::OnOK(wxCommandEvent& event)
+void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))

 {
   if ( Validate() && TransferDataFromWindow() )
   {
 {
   if ( Validate() && TransferDataFromWindow() )
   {

-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
-        {
-            SetReturnCode(wxID_OK);
-            this->Show(FALSE);
-        }
+      EndDialog(wxID_OK);

   }
 }
 
   }
 }
 

-void wxDialog::OnApply(wxCommandEvent& event)
+void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))

 {
 {

-  if (Validate())
-    TransferDataFromWindow();
-  // TODO probably need to disable the Apply button until things change again
+    if ( Validate() )
+        TransferDataFromWindow();
+
+    // TODO probably need to disable the Apply button until things change again

 }
 
 }
 

-void wxDialog::OnCancel(wxCommandEvent& event)
+void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))

 {
 {

-    if ( IsModal() )
-        EndModal(wxID_CANCEL);
-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-        this->Show(FALSE);
-    }
+    EndDialog(wxID_CANCEL);

 }
 
 }
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
 {

-    // We'll send a Cancel message by default,
-    // which may close the dialog.
+    // We'll send a Cancel message by default, which may close the dialog.

     // Check for looping if the Cancel event handler calls Close().
 
     // Note that if a cancel button and handler aren't present in the dialog,
     // nothing will happen when you close the dialog via the window manager, or
     // Check for looping if the Cancel event handler calls Close().
 
     // Note that if a cancel button and handler aren't present in the dialog,
     // nothing will happen when you close the dialog via the window manager, or

-    // via Close().
-    // We wouldn't want to destroy the dialog by default, since the dialog may have been
-    // created on the stack.
-    // However, this does mean that calling dialog->Close() won't delete the dialog
-    // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
-    // sure to destroy the dialog.
-    // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
-
+    // via Close(). We wouldn't want to destroy the dialog by default, since
+    // the dialog may have been created on the stack. However, this does mean
+    // that calling dialog->Close() won't delete the dialog unless the handler
+    // for wxID_CANCEL does so. So use Destroy() if you want to be sure to
+    // destroy the dialog. The default OnCancel (above) simply ends a modal
+    // dialog, and hides a modeless dialog.
+
+    // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global
+    //     lists here? don't dare to change it now, but should be done later!

     static wxList closing;
 
     if ( closing.Member(this) )
     static wxList closing;
 
     if ( closing.Member(this) )


@@ -609,32 +429,13 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     closing.DeleteObject(this);
 }
 
     closing.DeleteObject(this);
 }
 

-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
-{
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
-
-void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-  // if we're using constraints - do use them
-  #if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() )
-    {
-      Layout();
-    }
-  #endif
-}
-
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))

 {
 #if wxUSE_CTL3D
 {
 #if wxUSE_CTL3D

-  Ctl3dColorChange();
+    Ctl3dColorChange();

 #else
 #else

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    Refresh();

 #endif
 }
 
 #endif
 }
 


@@ -642,18 +443,87 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
 // dialog window proc
 // ---------------------------------------------------------------------------
 
 // dialog window proc
 // ---------------------------------------------------------------------------
 

-long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-    long rc = 0;
-    bool processed = FALSE;
+    WXLRESULT rc = 0;
+    bool processed = false;

 
     switch ( message )
     {
 
     switch ( message )
     {

+#ifdef __WXWINCE__
+        // react to pressing the OK button in the title
+        case WM_COMMAND:
+        {
+            switch ( LOWORD(wParam) )
+            {
+#ifndef __SMARTPHONE__
+                case IDOK:
+                    wxButton *btn = wxDynamicCast(FindWindow(wxID_CANCEL), wxButton);
+                    if ( btn && btn->IsEnabled() )
+                    {
+                        // if we do have a cancel button, do press it
+                        btn->MSWCommand(BN_CLICKED, 0 /* unused */);
+                        processed = true;
+                        break;
+                    }
+#else // ifdef __SMARTPHONE__
+                case IDM_LEFT:
+                case IDM_RIGHT:
+                    processed = HandleCommand( LOWORD(wParam) , 0 , NULL );
+                    break;
+#endif // __SMARTPHONE__
+            }
+            break;
+        }
+#endif

         case WM_CLOSE:
             // if we can't close, tell the system that we processed the
             // message - otherwise it would close us
             processed = !Close();
             break;
         case WM_CLOSE:
             // if we can't close, tell the system that we processed the
             // message - otherwise it would close us
             processed = !Close();
             break;

+
+        case WM_SIZE:
+            // the Windows dialogs unfortunately are not meant to be resizeable
+            // at all and their standard class doesn't include CS_[VH]REDRAW
+            // styles which means that the window is not refreshed properly
+            // after the resize and no amount of WS_CLIPCHILDREN/SIBLINGS can
+            // help with it - so we have to refresh it manually which certainly
+            // creates flicker but at least doesn't show garbage on the screen
+            rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+            processed = true;
+            if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) )
+            {
+                ::InvalidateRect(GetHwnd(), NULL, false /* erase bg */);
+            }
+            break;
+
+#ifndef __WXMICROWIN__
+        case WM_SETCURSOR:
+            // we want to override the busy cursor for modal dialogs:
+            // typically, wxBeginBusyCursor() is called and then a modal dialog
+            // is shown, but the modal dialog shouldn't have hourglass cursor
+            if ( IsModal() && wxIsBusy() )
+            {
+                // set our cursor for all windows (but see below)
+                wxCursor cursor = m_cursor;
+                if ( !cursor.Ok() )
+                    cursor = wxCURSOR_ARROW;
+
+                ::SetCursor(GetHcursorOf(cursor));
+
+                // in any case, stop here and don't let wxWindow process this
+                // message (it would set the busy cursor)
+                processed = true;
+
+                // but return false to tell the child window (if the event
+                // comes from one of them and not from ourselves) that it can
+                // set its own cursor if it has one: thus, standard controls
+                // (e.g. text ctrl) still have correct cursors in a dialog
+                // invoked while wxIsBusy()
+                rc = false;
+            }
+            break;
+#endif // __WXMICROWIN__

     }
 
     if ( !processed )
     }
 
     if ( !processed )


@@ -661,3 +531,19 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 
     return rc;
 }
 
     return rc;
 }

+
+#if wxUSE_CTL3D
+
+// Define for each class of dialog and control
+WXHBRUSH wxDialog::OnCtlColor(WXHDC WXUNUSED(pDC),
+                              WXHWND WXUNUSED(pWnd),
+                              WXUINT WXUNUSED(nCtlColor),
+                              WXUINT message,
+                              WXWPARAM wParam,
+                              WXLPARAM lParam)
+{
+    return (WXHBRUSH)Ctl3dCtlColorEx(message, wParam, lParam);
+}
+
+#endif // wxUSE_CTL3D
+