Fix assert when creating wxBitmapButton without a valid bitmap in wxMSW.

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 765092e7dad782534658d7cb3e59f5445f138eae..3e54725e3a8e99d8aa2819c37f6dab76cf46a4fc 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -1,622 +1,470 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP

 #include "wx/dialog.h"
 #include "wx/dialog.h"

-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/app.h"
+    #include "wx/button.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/toolbar.h"

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

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

 
 

-#if wxUSE_COMMON_DIALOGS
-#include <commdlg.h>
-#endif
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    #include "wx/msw/wince/resources.h"
+#endif // __SMARTPHONE__ && __WXWINCE__

 
 

-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------

 
 

-// 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 WXDLLEXPORT wxPendingDelete;
+// ----------------------------------------------------------------------------
+// wxDialogModalData
+// ----------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+// 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) { }

 
 

-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()
+    void RunLoop()
+    {
+        m_evtLoop.Run();
+    }

 
 

-#endif
+    void ExitLoop()
+    {
+        m_evtLoop.Exit();
+    }

 
 

-long wxDialog::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-  return ::CallWindowProc(CASTWNDPROC m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
-}
+private:
+    wxModalEventLoop m_evtLoop;
+};

 
 

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

 
 

-bool wxDialog::MSWOnClose(void)
-{
-    return Close();
-}
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-wxDialog::wxDialog(void)
-{
-  m_isShown = FALSE;
-  m_modalShowing = FALSE;
+// ----------------------------------------------------------------------------
+// wxDialog construction
+// ----------------------------------------------------------------------------

 
 

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+void wxDialog::Init()
+{
+    m_isShown = false;
+    m_modalData = NULL;
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+    m_dialogToolBar = NULL;
+#endif
+#if wxUSE_DIALOG_SIZEGRIP
+    m_hGripper = 0;
+#endif // wxUSE_DIALOG_SIZEGRIP

 }
 
 }
 

-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+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));
-  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;
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    // All dialogs should really have this style
+    style |= wxTAB_TRAVERSAL;

 
 

-  if (x < 0) x = wxDIALOG_DEFAULT_X;
-  if (y < 0) y = wxDIALOG_DEFAULT_Y;
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return false;

 
 

-  m_windowStyle = style;
+    if ( !m_hasFont )
+        SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-  m_isShown = FALSE;
-  m_modalShowing = FALSE;
-
-  if (width < 0)
-    width = 500;
-  if (height < 0)
-    height = 500;
-
-  WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
-  if (m_windowStyle & wxSTAY_ON_TOP)
-    extendedStyle |= WS_EX_TOPMOST;
-
-  // 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);
-  }
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    SetLeftMenu(wxID_OK, _("OK"));
+#endif
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+    CreateToolBar();
+#endif

 
 

-  SubclassWin(GetHWND());
+#if wxUSE_DIALOG_SIZEGRIP
+    if ( HasFlag(wxRESIZE_BORDER) )
+    {
+        CreateGripper();

 
 

-  SetWindowText((HWND) GetHWND(), (const char *)title);
-  SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+        Connect(wxEVT_CREATE,
+                wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
+    }
+#endif // wxUSE_DIALOG_SIZEGRIP

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

-void wxDialog::SetModal(bool flag)
+wxDialog::~wxDialog()

 {
 {

-  if ( flag )
-    m_windowStyle |= wxDIALOG_MODAL ;
-  else
-    if ( m_windowStyle & wxDIALOG_MODAL )
-        m_windowStyle -= wxDIALOG_MODAL ;
-  
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
+    // this will also reenable all the other windows for a modal dialog
+    Show(false);
+
+#if wxUSE_DIALOG_SIZEGRIP
+    DestroyGripper();
+#endif // wxUSE_DIALOG_SIZEGRIP

 }
 
 }
 

-wxDialog::~wxDialog()
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------
+
+bool wxDialog::Show(bool show)

 {
 {

-  m_isBeingDeleted = TRUE;
-
-  wxTopLevelWindows.DeleteObject(this);
-
-  if (m_modalShowing)
-  {
-    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())
+    if ( show == IsShown() )
+        return false;
+
+    if ( !show && m_modalData )

     {
     {

-       PostQuitMessage(0);
+        // 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();

     }
     }

-  }
-}

 
 

-// By default, pressing escape cancels the dialog
-void wxDialog::OnCharHook(wxKeyEvent& event)
-{
-  if (GetHWND())
-  {
-    if (event.m_keyCode == WXK_ESCAPE)
+    if ( show )

     {
     {

-    // 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);
+        if (CanDoLayoutAdaptation())
+            DoLayoutAdaptation();

 
 

-    return;
+        // 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();

     }
     }

-  }
-  // We didn't process this event.
-  event.Skip();
-}

 
 

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

 
 

-void wxDialog::Fit(void)
-{
-  wxWindow::Fit();
-}
+    if ( show )
+    {
+        // dialogs don't get WM_SIZE message from ::ShowWindow() for some
+        // reason so generate it ourselves for consistency with frames and
+        // dialogs in other ports
+        //
+        // NB: normally we should call it just the first time but doing it
+        //     every time is simpler than keeping a flag
+        const wxSize size = GetClientSize();
+        ::SendMessage(GetHwnd(), WM_SIZE,
+                      SIZE_RESTORED, MAKELPARAM(size.x, size.y));
+    }

 
 

-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-  // Windows dialog boxes can't be iconized
+    return true;

 }
 
 }
 

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

 {
 {

-  return FALSE;
+    ::SetForegroundWindow(GetHwnd());

 }
 
 }
 

-void wxDialog::SetClientSize(int width, int height)
+// show dialog modally
+int wxDialog::ShowModal()

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  RECT rect;
-  GetClientRect(hWnd, &rect);
-
-  RECT rect2;
-  GetWindowRect(hWnd, &rect2);
+    wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );

 
 

-  // 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;
+    Show();

 
 

-  MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE);
+    // EndModal may have been called from InitDialog handler (called from
+    // inside Show()) and hidden the dialog back again
+    if ( IsShown() )
+    {
+        // enter and run the modal loop
+        wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                           new wxDialogModalData(this));
+        modalData->RunLoop();
+    }

 
 

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

 }
 
 }
 

-void wxDialog::GetPosition(int *x, int *y) const
+void wxDialog::EndModal(int retCode)

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  RECT rect;
-  GetWindowRect(hWnd, &rect);
+    wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );

 
 

-  *x = rect.left;
-  *y = rect.top;
-}
+    SetReturnCode(retCode);

 
 

-bool wxDialog::IsShown(void) const
-{
-  return m_isShown;
+    Hide();

 }
 
 }
 

-bool wxDialog::Show(bool show)
-{
-  m_isShown = show;
-
-  if (show)
-    InitDialog();
-
-  bool modal =  ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL) ;
-
-#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
+// ----------------------------------------------------------------------------
+// wxDialog gripper handling
+// ----------------------------------------------------------------------------

 
 

-  if (modal)
-  {
-    if (show)
-    {
-      m_hwndOldFocus = (WXHWND)::GetFocus();
-
-      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()))
-        {
-          ::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 (m_acceleratorTable.Ok() &&
-          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), &msg))
-        {
-            // Have processed the message
-        }
-        else if (!IsDialogMessage((HWND) GetHWND(), &msg))
-        {
-          TranslateMessage(&msg);
-          DispatchMessage(&msg);
-        }
+#if wxUSE_DIALOG_SIZEGRIP

 
 

-        // If we get crashes (as per George Tasker's message) with nested modal dialogs,
-        // we should try removing the m_modalShowing test
+void wxDialog::SetWindowStyleFlag(long style)
+{
+    wxDialogBase::SetWindowStyleFlag(style);

 
 

-        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.Member(win) || wxModelessWindows.Member(win))
-        {
-          HWND hWnd = (HWND) win->GetHWND();
-          if (::IsWindow(hWnd))
-            ::EnableWindow(hWnd,TRUE);
-        }
-        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)
-      {
-        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)
-        {
-          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();
-        }
-      }
-      // 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());
-    }
+    if ( HasFlag(wxRESIZE_BORDER) )
+        CreateGripper();

     else
     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;
+        DestroyGripper();

 }
 
 }
 

-void wxDialog::SetTitle(const wxString& title)
+void wxDialog::CreateGripper()

 {
 {

-  SetWindowText((HWND) GetHWND(), (const char *)title);
+    if ( !m_hGripper )
+    {
+        // just create it here, it will be positioned and shown later
+        m_hGripper = (WXHWND)::CreateWindow
+                               (
+                                    wxT("SCROLLBAR"),
+                                    wxT(""),
+                                    WS_CHILD |
+                                    WS_CLIPSIBLINGS |
+                                    SBS_SIZEGRIP |
+                                    SBS_SIZEBOX |
+                                    SBS_SIZEBOXBOTTOMRIGHTALIGN,
+                                    0, 0, 0, 0,
+                                    GetHwnd(),
+                                    0,
+                                    wxGetInstance(),
+                                    NULL
+                               );
+    }

 }
 
 }
 

-wxString wxDialog::GetTitle(void) const
+void wxDialog::DestroyGripper()

 {
 {

-  GetWindowText((HWND) GetHWND(), wxBuffer, 1000);
-  return wxString(wxBuffer);
+    if ( m_hGripper )
+    {
+        // we used to have trouble with gripper appearing on top (and hence
+        // overdrawing) the other, real, dialog children -- check that this
+        // isn't the case automatically (but notice that this could be false if
+        // we're not shown at all as in this case ResizeGripper() might not
+        // have been called yet)
+        wxASSERT_MSG( !IsShown() ||
+                      ::GetWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,
+            wxT("Bug in wxWidgets: gripper should be at the bottom of Z-order") );
+        ::DestroyWindow((HWND) m_hGripper);
+        m_hGripper = 0;
+    }

 }
 
 }
 

-void wxDialog::Centre(int direction)
+void wxDialog::ShowGripper(bool show)

 {
 {

-  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 ;
-  }
-
-  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);
-}
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
-int wxDialog::ShowModal(void)
-{
-  m_windowStyle |= wxDIALOG_MODAL;
-  Show(TRUE);
-  return GetReturnCode();
-}
+    if ( show )
+        ResizeGripper();

 
 

-void wxDialog::EndModal(int retCode)
-{
-  SetReturnCode(retCode);
-  Show(FALSE);
+    ::ShowWindow((HWND)m_hGripper, show ? SW_SHOW : SW_HIDE);

 }
 
 }
 

-// Define for each class of dialog and control
-WXHBRUSH wxDialog::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-      WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+void wxDialog::ResizeGripper()

 {
 {

-#if wxUSE_CTL3D
-  HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-  return (WXHBRUSH) hbrush;
-#else
-  return 0;
-#endif
-}
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
 

-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
-{
-  if ( Validate() && TransferDataFromWindow() )
-  {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
-        {
-            SetReturnCode(wxID_OK);
-            this->Show(FALSE);
-        }
-  }
-}
+    HWND hwndGripper = (HWND)m_hGripper;

 
 

-void wxDialog::OnApply(wxCommandEvent& event)
-{
-  if (Validate())
-    TransferDataFromWindow();
-  // TODO probably need to disable the Apply button until things change again
+    const wxRect rectGripper = wxRectFromRECT(wxGetWindowRect(hwndGripper));
+    const wxSize size = GetClientSize() - rectGripper.GetSize();
+
+    ::SetWindowPos(hwndGripper, HWND_BOTTOM,
+                   size.x, size.y,
+                   rectGripper.width, rectGripper.height,
+                   SWP_NOACTIVATE);

 }
 
 }
 

-void wxDialog::OnCancel(wxCommandEvent& event)
+void wxDialog::OnWindowCreate(wxWindowCreateEvent& event)

 {
 {

-    if ( IsModal() )
-        EndModal(wxID_CANCEL);
-    else
+    if ( m_hGripper && IsShown() &&
+            event.GetWindow() && event.GetWindow()->GetParent() == this )

     {
     {

-        SetReturnCode(wxID_CANCEL);
-    this->Show(FALSE);
+        // Put gripper below the newly created child window
+        ::SetWindowPos((HWND)m_hGripper, HWND_BOTTOM, 0, 0, 0, 0,
+                       SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);

     }
     }

-}
-
-bool wxDialog::OnClose(void)
-{
-    // 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()

 
 

-    static wxList closing;
+    event.Skip();
+}

 
 

-    if ( closing.Member(this) )
-        return FALSE;
+#endif // wxUSE_DIALOG_SIZEGRIP

 
 

-    closing.Append(this);
+// ----------------------------------------------------------------------------
+// wxWin event handlers
+// ----------------------------------------------------------------------------

 
 

-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    cancelEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(cancelEvent);
+#ifdef __POCKETPC__
+// Responds to the OK button in a PocketPC titlebar. This
+// can be overridden, or you can change the id used for
+// sending the event, by calling SetAffirmativeId.
+bool wxDialog::DoOK()
+{
+    const int idOk = GetAffirmativeId();
+    if ( EmulateButtonClickIfPresent(idOk) )
+        return true;

 
 

-    closing.DeleteObject(this);
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+    event.SetEventObject(this);

 
 

-    return FALSE;
+    return HandleWindowEvent(event);

 }
 }

+#endif // __POCKETPC__

 
 

-void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event))
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+// create main toolbar by calling OnCreateToolBar()
+wxToolBar* wxDialog::CreateToolBar(long style, wxWindowID winid, const wxString& name)

 {
 {

-  // if we're using constraints - do use them
-  #if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() ) {
-      Layout();
-    }
-  #endif
-}
+    m_dialogToolBar = OnCreateToolBar(style, winid, name);

 
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
-    else
-        event.Veto(TRUE);
+    return m_dialogToolBar;

 }
 
 }
 

-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy(void)
+// return a new toolbar
+wxToolBar *wxDialog::OnCreateToolBar(long style,
+                                       wxWindowID winid,
+                                       const wxString& name)

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
+    return new wxToolMenuBar(this, winid,
+                         wxDefaultPosition, wxDefaultSize,
+                         style, name);

 }
 }

+#endif
+
+// ---------------------------------------------------------------------------
+// dialog Windows messages processing
+// ---------------------------------------------------------------------------

 
 

-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-#if wxUSE_CTL3D
-  Ctl3dColorChange();
-#else
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
+    WXLRESULT rc = 0;
+    bool processed = false;
+
+    switch ( message )
+    {
+#ifdef __WXWINCE__
+        // react to pressing the OK button in the title
+        case WM_COMMAND:
+        {
+            switch ( LOWORD(wParam) )
+            {
+#ifdef __POCKETPC__
+                case IDOK:
+                    processed = DoOK();
+                    if (!processed)
+                        processed = !Close();

 #endif
 #endif

-}
+#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_SIZE:
+#if wxUSE_DIALOG_SIZEGRIP
+            if ( m_hGripper )
+            {
+                switch ( wParam )
+                {
+                    case SIZE_MAXIMIZED:
+                        ShowGripper(false);
+                        break;

 
 

-long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-  return wxWindow::MSWWindowProc(message, wParam, lParam);
-}
+                    case SIZE_RESTORED:
+                        ShowGripper(true);
+                }
+            }
+#endif // wxUSE_DIALOG_SIZEGRIP
+
+            // the Windows dialogs unfortunately are not meant to be resizable
+            // 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.IsOk() )
+                    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 )
+        rc = wxWindow::MSWWindowProc(message, wParam, lParam);

 
 

+    return rc;
+}