Some additions to the 12-bit patch.

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 8cb74e93003a4a0d356775741454e8ee367a69af..d528829c9d7eabb5aa2b1dda1a59b81309857a57 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -1,602 +1,492 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "dialog.h"
+    #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/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"
 #endif
 
 #include "wx/msw/private.h"

+#include "wx/log.h"

 
 

-#if USE_COMMON_DIALOGS
-#include <commdlg.h>
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
+    #include <commdlg.h>

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// default dialog pos and size
+

 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 
 #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
-wxList wxModalDialogs;
-wxList wxModelessWindows;  // Frames and modeless dialogs
-extern wxList wxPendingDelete;
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
-  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()
+#define wxDIALOG_DEFAULT_WIDTH 500
+#define wxDIALOG_DEFAULT_HEIGHT 500

 
 

-#endif
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------

 
 

-long wxDialog::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-  return ::CallWindowProc(CASTWNDPROC (FARPROC) m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
-}
+// all modal dialogs currently shown
+static wxWindowList wxModalDialogs;

 
 

-bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
-{
-  return (::IsDialogMessage((HWND) GetHWND(), (MSG*)pMsg) != 0);
-}
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------

 
 

-bool wxDialog::MSWOnClose(void)
-{
-    return Close();
-}
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

 
 

-wxDialog::wxDialog(void)
-{
-  m_isShown = FALSE;
-  m_modalShowing = FALSE;
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
+    EVT_BUTTON(wxID_OK, wxDialog::OnOK)
+    EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
+    EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)

 
 

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-}
+    EVT_CHAR_HOOK(wxDialog::OnCharHook)

 
 

-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
-{
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetName(name);
-  
-  if (!parent)
-    wxTopLevelWindows.Append(this);
+    EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)

 
 

-//  windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
+    EVT_CLOSE(wxDialog::OnCloseWindow)
+END_EVENT_TABLE()

 
 

-  if (parent) parent->AddChild(this);
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
+// ----------------------------------------------------------------------------
+// wxDialog construction
+// ----------------------------------------------------------------------------

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+void wxDialog::Init()
+{
+    m_oldFocus = (wxWindow *)NULL;

 
 

-  if (x < 0) x = wxDIALOG_DEFAULT_X;
-  if (y < 0) y = wxDIALOG_DEFAULT_Y;
+    m_isShown = FALSE;

 
 

-  m_windowStyle = style;
+    m_windowDisabler = (wxWindowDisabler *)NULL;

 
 

-  m_isShown = FALSE;
-  m_modalShowing = FALSE;
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+}

 
 

-  if (width < 0)
-    width = 500;
-  if (height < 0)
-    height = 500;
+bool wxDialog::Create(wxWindow *parent,
+                      wxWindowID id,
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxString& name)
+{
+    Init();

 
 

-  WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
-  if (m_windowStyle & wxSTAY_ON_TOP)
-    extendedStyle |= WS_EX_TOPMOST;
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
 

-  // Allows creation of dialogs with & without captions under MSWindows
-  if(style & wxCAPTION){
-    MSWCreate(m_windowId, (wxWindow *)parent, NULL, this, NULL, x, y, width, height, 0, "wxCaptionDialog",
-         extendedStyle);
-  }
-  else{
-    MSWCreate(m_windowId, (wxWindow *)parent, NULL, this, NULL, x, y, width, height, 0, "wxNoCaptionDialog",
-         extendedStyle);
-  }
+    // save focus before doing anything which can potentially change it
+    m_oldFocus = FindFocus();

 
 

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

 
 

-  SetWindowText((HWND) GetHWND(), (const char *)title);
-  SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;

 
 

-  return TRUE;
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+
+    return TRUE;

 }
 
 void wxDialog::SetModal(bool flag)
 {
 }
 
 void wxDialog::SetModal(bool flag)
 {

-       if ( flag )
-               m_windowStyle |= wxDIALOG_MODAL ;
-       else
-               if ( m_windowStyle & wxDIALOG_MODAL )
-                       m_windowStyle -= wxDIALOG_MODAL ;
-  
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
+    if ( flag )
+    {
+        m_windowStyle |= wxDIALOG_MODAL;
+
+        wxModelessWindows.DeleteObject(this);
+    }
+    else
+    {
+        m_windowStyle &= ~wxDIALOG_MODAL;
+
+        wxModelessWindows.Append(this);
+    }

 }
 
 wxDialog::~wxDialog()
 {
 }
 
 wxDialog::~wxDialog()
 {

-  m_isBeingDeleted = TRUE;
-
-  wxTopLevelWindows.DeleteObject(this);
+    m_isBeingDeleted = TRUE;

 
 

-  if (m_modalShowing)
-  {
+    // this will also reenable all the other windows for a modal dialog

     Show(FALSE);
     Show(FALSE);

-    // 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());
-  }
-
-  m_modalShowing = FALSE;
-  if ( GetHWND() )
-    ShowWindow((HWND) GetHWND(), SW_HIDE);
-
-  if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-    wxModelessWindows.DeleteObject(this);
-
-  UnsubclassWin();
-
-  // If this is the last top-level window, exit.
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
-
-    if (wxTheApp->GetExitOnFrameDelete())
-    {
-       PostQuitMessage(0);
-    }
-  }

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// kbd handling
+// ----------------------------------------------------------------------------
+

 // By default, pressing escape cancels the dialog
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {
 // By default, pressing escape cancels the dialog
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {

-  if (GetHWND())
-  {
-    if (event.m_keyCode == WXK_ESCAPE)
+    if (GetHWND())

     {
     {

-               // 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);
+        // "Esc" works as an accelerator for the "Cancel" button, but it
+        // shouldn't close the dialog which doesn't have any cancel button
+        if ( (event.m_keyCode == WXK_ESCAPE) && FindWindow(wxID_CANCEL) )
+        {
+            wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+            cancelEvent.SetEventObject( this );
+            GetEventHandler()->ProcessEvent(cancelEvent);

 
 

-               return;
-    }
-  }
-  // We didn't process this event.
-  event.Skip();
-}
+            // ensure that there is another message for this window so the
+            // ShowModal loop will exit and won't get stuck in GetMessage().
+            ::PostMessage(GetHwnd(), WM_NULL, 0, 0);

 
 

-void wxDialog::OnPaint(wxPaintEvent& event)
-{
-       // No: if you call the default procedure, it makes
-       // the following painting code not work.
-//     wxWindow::OnPaint(event);
-}
+            return;
+        }
+    }

 
 

-void wxDialog::Fit(void)
-{
-  wxWindow::Fit();
+    // We didn't process this event.
+    event.Skip();

 }
 
 }
 

-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-  // Windows dialog boxes can't be iconized
-}
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-  return FALSE;
+    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;

 }
 
 }
 

-void wxDialog::SetSize(int x, int y, int width, int height, int WXUNUSED(sizeFlags))
+bool wxDialog::IsModalShowing() const

 {
 {

-  wxWindow::SetSize(x, y, width, height);
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast

 }
 
 }
 

-void wxDialog::SetClientSize(int width, int height)
+void wxDialog::DoShowModal()

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  RECT rect;
-  GetClientRect(hWnd, &rect);
+    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+    wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );

 
 

-  RECT rect2;
-  GetWindowRect(hWnd, &rect2);
+    wxModalDialogs.Append(this);

 
 

-  // 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;
+    wxWindow *parent = GetParent();

 
 

-  MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE);
+    wxWindow* oldFocus = m_oldFocus;

 
 

-  wxSizeEvent event(wxSize(actual_width, actual_height), m_windowId);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-}
-
-void wxDialog::GetPosition(int *x, int *y) const
-{
-  HWND hWnd = (HWND) GetHWND();
-  RECT rect;
-  GetWindowRect(hWnd, &rect);
+    // 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 = 0;
+    if (oldFocus)
+        hwndOldFocus = (HWND) oldFocus->GetHWND();

 
 

-  *x = rect.left;
-  *y = rect.top;
-}
+    // remember where the focus was
+    if ( !oldFocus )
+    {
+        oldFocus = parent;
+        if ( parent )
+            hwndOldFocus = GetHwndOf(parent);
+    }

 
 

-bool wxDialog::IsShown(void) const
-{
-  return m_isShown;
-}
+    // disable all other app windows
+    wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );

 
 

-bool wxDialog::Show(bool show)
-{
-  m_isShown = show;
+    m_windowDisabler = new wxWindowDisabler(this);

 
 

-  if (show)
-    InitDialog();
+    // enter the modal loop
+    while ( IsModalShowing() )
+    {
+#if wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS

 
 

-  bool modal =  ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL) ;
+        while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
+            ;

 
 

-#if WXGARBAGE_COLLECTION_ON /* MATTHEW: GC */
-  if (!modal) {
-    if (show) {
-      if (!wxModelessWindows.Member(this))
-       wxModelessWindows.Append(this);
-    } else
-      wxModelessWindows.DeleteObject(this);
-  }
-  if (show) {
-    if (!wxTopLevelWindows.Member(this))
-      wxTopLevelWindows.Append(this);
-  } else
-    wxTopLevelWindows.DeleteObject(this);
-#endif
+        // a message came or no more idle processing to do
+        wxTheApp->DoMessage();
+    }

 
 

-  if (modal)
-  {
-    if (show)
+    // 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))

     {
     {

-      wxList DisabledWindows;
-      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();
-      }
-      node = wxModelessWindows.First();
-      while (node)
-      {
-        wxWindow *win = (wxWindow *)node->Data();
-               if (::IsWindowEnabled((HWND) win->GetHWND()))
-               {
-          ::EnableWindow((HWND) win->GetHWND(), FALSE);
-          DisabledWindows.Append(win);
-               }
-        node = node->Next();
-      }
-
-      ShowWindow((HWND) GetHWND(), SW_SHOW);
-      EnableWindow((HWND) GetHWND(), TRUE);
-      BringWindowToTop((HWND) GetHWND());
-
-      if (!wxModalDialogs.Member(this))
-        wxModalDialogs.Append(this);
-
-      MSG msg;
-      // Must test whether this dialog still exists: we may not process
-      // a message before the deletion.
-      while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
-      {
-        if (!IsDialogMessage((HWND) GetHWND(), &msg))
-        {
-          TranslateMessage(&msg);
-          DispatchMessage(&msg);
-        }
-        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();
-        HWND hWnd = (HWND) win->GetHWND();
-        if (::IsWindow(hWnd) && (wxModalDialogs.Member(win) || wxModelessWindows.Member(win) ))
-          ::EnableWindow(hWnd,TRUE);
-        node=node->Next();
-      }
+        // This is likely to prove that the object still exists
+        if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+            oldFocus->SetFocus();

     }
     }

-    else
+}
+
+bool wxDialog::Show(bool show)
+{
+    if ( !show )

     {
     {

-      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)
-      {
-        wxDialog *box = (wxDialog *)last->Data();
-        HWND hwnd = (HWND) box->GetHWND();
-        if (box->m_winEnabled)
-          EnableWindow(hwnd, TRUE);
-        BringWindowToTop(hwnd);
-      }
-      else
-      {
-        wxNode *node = wxModelessWindows.First();
-        while (node)
+        // if we had disabled other app windows, reenable them back now because
+        // if they stay disabled Windows will activate another window (one
+        // which is enabled, anyhow) and we will lose activation
+        if ( m_windowDisabler )

         {
         {

-          wxWindow *win = (wxWindow *)node->Data();
-          HWND hwnd = (HWND) win->GetHWND();
-          // Only enable again if not user-disabled.
-          if (win->IsUserEnabled())
-            EnableWindow(hwnd, TRUE);
-          node = node->Next();
+            delete m_windowDisabler;
+            m_windowDisabler = NULL;

         }
         }

-      }
-      // 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
-  {
-    if (show)
+
+    // ShowModal() may be called for already shown dialog
+    if ( !wxDialogBase::Show(show) && !(show && IsModal()) )

     {
     {

-      ShowWindow((HWND) GetHWND(), SW_SHOW);
-      BringWindowToTop((HWND) GetHWND());
+        // nothing to do
+        return FALSE;

     }
     }

-    else
+
+    if ( show )

     {
     {

-      // 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);
+        // usually will result in TransferDataToWindow() being called
+        InitDialog();

     }
     }

-  }
-  return TRUE;
-}

 
 

-void wxDialog::SetTitle(const wxString& title)
-{
-  SetWindowText((HWND) GetHWND(), (const char *)title);
-}
+    if ( IsModal() )
+    {
+        if ( show )
+        {
+            // modal dialog needs a parent window, so try to find one
+            if ( !GetParent() )
+            {
+                wxWindow *parent = wxTheApp->GetTopWindow();
+                if ( parent && parent != this && parent->IsShown() )
+                {
+                    // use it
+                    m_parent = parent;
+                }
+            }

 
 

-wxString wxDialog::GetTitle(void) const
-{
-  GetWindowText((HWND) GetHWND(), wxBuffer, 1000);
-  return wxString(wxBuffer);
+            DoShowModal();
+        }
+        else // end of modal dialog
+        {
+            // this will cause IsModalShowing() return FALSE and our local
+            // message loop will terminate
+            wxModalDialogs.DeleteObject(this);
+        }
+    }
+
+    return TRUE;

 }
 
 }
 

-void wxDialog::Centre(int direction)
+// a special version for Show(TRUE) for modal dialogs which returns return code
+int wxDialog::ShowModal()

 {
 {

-  int x_offset,y_offset ;
-  int display_width, display_height;
-  int  width, height, x, y;
-  wxFrame *frame ;
-  if (direction & wxCENTER_FRAME)
-  {
-    frame = (wxFrame*)GetParent() ;
-    if (frame)
+    if ( !IsModal() )

     {
     {

-      frame->GetPosition(&x_offset,&y_offset) ;
-      frame->GetSize(&display_width,&display_height) ;
+        SetModal(TRUE);

     }
     }

-  }
-  else
-    frame = NULL ;
-
-  if (frame==NULL)
-  {
-    wxDisplaySize(&display_width, &display_height);
-    x_offset = 0 ;
-    y_offset = 0 ;
-  }

 
 

+    Show(TRUE);

 
 

-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  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);
-}
-
-// Replacement for Show(TRUE) for modal dialogs - returns return code
-int wxDialog::ShowModal(void)
-{
-       Show(TRUE);
-       return GetReturnCode();
+    return GetReturnCode();

 }
 
 }
 

+// NB: this function (surprizingly) may be called for both modal and modeless
+//     dialogs and should work for both of them

 void wxDialog::EndModal(int retCode)
 {
 void wxDialog::EndModal(int retCode)
 {

-       SetReturnCode(retCode);
-       Show(FALSE);
-}
+    SetReturnCode(retCode);

 
 

-// Define for each class of dialog and control
-WXHBRUSH wxDialog::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if CTL3D
-  HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-  return (WXHBRUSH) hbrush;
-#else
-  return 0;
-#endif
+    Show(FALSE);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// wxWin event handlers
+// ----------------------------------------------------------------------------
+

 // Standard buttons
 // Standard buttons

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

 {
 {

-       if ( Validate() && TransferDataFromWindow() )
-       {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
-        {
-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
-        }
-       }
+  if ( Validate() && TransferDataFromWindow() )
+  {
+      EndModal(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);
-    }
+    EndModal(wxID_CANCEL);

 }
 
 }
 

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

 {
 {

-       // Behaviour changed in 2.0: we'll send a Cancel message by default,
-    // which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close()
-
+    // 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
+    // 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) )

-        return FALSE;
+        return;

 
     closing.Append(this);
 
 
     closing.Append(this);
 

-       wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-       cancelEvent.SetEventObject( this );
-       GetEventHandler()->ProcessEvent(cancelEvent);
+    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    cancelEvent.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog

 
     closing.DeleteObject(this);
 
     closing.DeleteObject(this);

+}

 
 

-       return FALSE;
+void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+{
+#if wxUSE_CTL3D
+    Ctl3dColorChange();
+#else
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    Refresh();
+#endif

 }
 
 }
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+// ---------------------------------------------------------------------------
+// dialog window proc
+// ---------------------------------------------------------------------------
+
+long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
+    long rc = 0;
+    bool processed = FALSE;
+
+    switch ( message )

     {
     {

-        this->Destroy();
+#if 0 // now that we got owner window right it doesn't seem to be needed
+        case WM_ACTIVATE:
+            switch ( LOWORD(wParam) )
+            {
+                case WA_ACTIVE:
+                case WA_CLICKACTIVE:
+                    if ( IsModalShowing() && GetParent() )
+                    {
+                        // bring the owner window to top as the standard dialog
+                        // boxes do
+                        if ( !::SetWindowPos
+                                (
+                                    GetHwndOf(GetParent()),
+                                    GetHwnd(),
+                                    0, 0,
+                                    0, 0,
+                                    SWP_NOACTIVATE |
+                                    SWP_NOMOVE |
+                                    SWP_NOSIZE
+                                ) )
+                        {
+                            wxLogLastError(wxT("SetWindowPos(SWP_NOACTIVATE)"));
+                        }
+                    }
+                    // fall through to process it normally as well
+            }
+            break;
+#endif // 0
+
+        case WM_CLOSE:
+            // if we can't close, tell the system that we processed the
+            // message - otherwise it would close us
+            processed = !Close();
+            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 ( IsModalShowing() && 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__

     }
     }

-}

 
 

-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy(void)
-{
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
+    if ( !processed )
+        rc = wxWindow::MSWWindowProc(message, wParam, lParam);

 
 

-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-#if CTL3D
-  Ctl3dColorChange();
-#else
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
-#endif
+    return rc;

 }
 
 }
 

-long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+#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 wxWindow::MSWWindowProc(message, wParam, lParam);
+    return (WXHBRUSH)Ctl3dCtlColorEx(message, wParam, lParam);

 }
 
 }
 

+#endif // wxUSE_CTL3D
+