wxSplitterWindow mouse capture improvements and cleanup.

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index a42c6494aac1390c501118ca8f6da1807d1ab5d8..592c23a9bc2252bef135cfe23243e2d5247e351f 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,24 +24,23 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dialog.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

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

+    #include "wx/button.h"

     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.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/log.h"

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

-#include "wx/ptr_scpd.h"
-
-#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
-    #include <commdlg.h>
-#endif
+#include "wx/scopedptr.h"

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


@@ -84,10 +79,14 @@ wxBEGIN_FLAGS( wxDialogStyle )
     wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
     wxFLAGS_MEMBER(wxSTAY_ON_TOP)
     wxFLAGS_MEMBER(wxCAPTION)
     wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
     wxFLAGS_MEMBER(wxSTAY_ON_TOP)
     wxFLAGS_MEMBER(wxCAPTION)

+#if WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxTHICK_FRAME)
     wxFLAGS_MEMBER(wxTHICK_FRAME)

+#endif // WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxSYSTEM_MENU)
     wxFLAGS_MEMBER(wxRESIZE_BORDER)
     wxFLAGS_MEMBER(wxSYSTEM_MENU)
     wxFLAGS_MEMBER(wxRESIZE_BORDER)

+#if WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxRESIZE_BOX)
     wxFLAGS_MEMBER(wxRESIZE_BOX)

+#endif // WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxCLOSE_BOX)
     wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
     wxFLAGS_MEMBER(wxMINIMIZE_BOX)
     wxFLAGS_MEMBER(wxCLOSE_BOX)
     wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
     wxFLAGS_MEMBER(wxMINIMIZE_BOX)


@@ -109,16 +108,6 @@ wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Ti
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 #endif
 

-BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
-    EVT_BUTTON(wxID_OK, wxDialog::OnOK)
-    EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
-    EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
-
-    EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-
-    EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-

 // ----------------------------------------------------------------------------
 // wxDialogModalData
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDialogModalData
 // ----------------------------------------------------------------------------


@@ -144,7 +133,7 @@ private:
     wxModalEventLoop m_evtLoop;
 };
 
     wxModalEventLoop m_evtLoop;
 };
 

-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -156,10 +145,14 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
 
 void wxDialog::Init()
 {
 
 void wxDialog::Init()
 {

-    m_oldFocus = (wxWindow *)NULL;

     m_isShown = false;
     m_modalData = NULL;
     m_isShown = false;
     m_modalData = NULL;

-    m_endModalCalled = false;
+#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,
 }
 
 bool wxDialog::Create(wxWindow *parent,


@@ -172,9 +165,6 @@ bool wxDialog::Create(wxWindow *parent,
 {
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 
 {
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 

-    // save focus before doing anything which can potentially change it
-    m_oldFocus = FindFocus();
-

     // All dialogs should really have this style
     style |= wxTAB_TRAVERSAL;
 
     // All dialogs should really have this style
     style |= wxTAB_TRAVERSAL;
 


@@ -187,70 +177,37 @@ bool wxDialog::Create(wxWindow *parent,
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetLeftMenu(wxID_OK, _("OK"));
 #endif
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetLeftMenu(wxID_OK, _("OK"));
 #endif

+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+    CreateToolBar();
+#endif

 
 

-    return true;
-}
-
-// deprecated ctor
-wxDialog::wxDialog(wxWindow *parent,
-                   const wxString& title,
-                   bool WXUNUSED(modal),
-                   int x,
-                   int y,
-                   int w,
-                   int h,
-                   long style,
-                   const wxString& name)
-{
-    Init();
+#if wxUSE_DIALOG_SIZEGRIP
+    if ( HasFlag(wxRESIZE_BORDER) )
+    {
+        CreateGripper();

 
 

-    Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
-}
+        Connect(wxEVT_CREATE,
+                wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
+    }
+#endif // wxUSE_DIALOG_SIZEGRIP

 
 

-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
-    // nothing to do, obsolete method
+    return true;

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

-    m_isBeingDeleted = true;
-

     // this will also reenable all the other windows for a modal dialog
     Show(false);
     // this will also reenable all the other windows for a modal dialog
     Show(false);

+
+#if wxUSE_DIALOG_SIZEGRIP
+    DestroyGripper();
+#endif // wxUSE_DIALOG_SIZEGRIP

 }
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

-bool wxDialog::IsModalShowing() const
-{
-    return IsModal();
-}
-
-wxWindow *wxDialog::FindSuitableParent() const
-{
-    // 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();
-    }
-
-    // finally, check if the parent we found is really suitable
-    if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
-    {
-        // don't use this one
-        parent = NULL;
-    }
-
-    return parent;
-}
-

 bool wxDialog::Show(bool show)
 {
     if ( show == IsShown() )
 bool wxDialog::Show(bool show)
 {
     if ( show == IsShown() )


@@ -268,6 +225,9 @@ bool wxDialog::Show(bool show)
 
     if ( show )
     {
 
     if ( show )
     {

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

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


@@ -278,13 +238,15 @@ bool wxDialog::Show(bool show)
 
     if ( 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
+        // 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
         //
         // NB: normally we should call it just the first time but doing it
         //     every time is simpler than keeping a flag

-        Layout();
+        const wxSize size = GetClientSize();
+        ::SendMessage(GetHwnd(), WM_SIZE,
+                      SIZE_RESTORED, MAKELPARAM(size.x, size.y));

     }
 
     return true;
     }
 
     return true;


@@ -298,56 +260,18 @@ void wxDialog::Raise()
 // show dialog modally
 int wxDialog::ShowModal()
 {
 // show dialog modally
 int wxDialog::ShowModal()
 {

-    wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
-
-    m_endModalCalled = false;
+    wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );

 
     Show();
 
     // EndModal may have been called from InitDialog handler (called from
 
     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 )
+    // inside Show()) and hidden the dialog back again
+    if ( IsShown() )

     {
     {

-        // modal dialog needs a parent window, so try to find one
-        wxWindow *parent = GetParent();
-        if ( !parent )
-        {
-            parent = FindSuitableParent();
-        }
-
-        // remember where the focus was
-        wxWindow *oldFocus = m_oldFocus;
-        if ( !oldFocus )
-        {
-            // VZ: do we really want to do this?
-            oldFocus = parent;
-        }
-
-        // 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;
-
-

         // enter and run the modal loop
         // enter and run the modal loop

-        {
-            wxDialogModalDataTiedPtr modalData(&m_modalData,
-                                               new wxDialogModalData(this));
-            modalData->RunLoop();
-        }
-
-
-        // 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))
-        {
-            // This is likely to prove that the object still exists
-            if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
-                oldFocus->SetFocus();
-        }
+        wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                           new wxDialogModalData(this));
+        modalData->RunLoop();

     }
 
     return GetReturnCode();
     }
 
     return GetReturnCode();


@@ -355,111 +279,152 @@ int wxDialog::ShowModal()
 
 void wxDialog::EndModal(int retCode)
 {
 
 void wxDialog::EndModal(int retCode)
 {

-    wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
+    wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );

 
 

-    m_endModalCalled = true;

     SetReturnCode(retCode);
 
     Hide();
 }
 
     SetReturnCode(retCode);
 
     Hide();
 }
 

-void wxDialog::EndDialog(int rc)
-{
-    if ( IsModal() )
-        EndModal(rc);
-    else
-        Hide();
-}
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxWin event handlers
+// wxDialog gripper handling

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+#if wxUSE_DIALOG_SIZEGRIP
+
+void wxDialog::SetWindowStyleFlag(long style)

 {
 {

-  if ( Validate() && TransferDataFromWindow() )
-  {
-      EndDialog(wxID_OK);
-  }
+    wxDialogBase::SetWindowStyleFlag(style);
+
+    if ( HasFlag(wxRESIZE_BORDER) )
+        CreateGripper();
+    else
+        DestroyGripper();

 }
 
 }
 

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

 {
 {

-    if ( Validate() )
-        TransferDataFromWindow();
-
-    // TODO probably need to disable the Apply button until things change again
+    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
+                               );
+    }

 }
 
 }
 

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

 {
 {

-    EndDialog(wxID_CANCEL);
+    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::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+void wxDialog::ShowGripper(bool show)

 {
 {

-    // We'll send a Cancel message by default, which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close().
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
 

-    // 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.
+    if ( show )
+        ResizeGripper();

 
 

-    // 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;
+    ::ShowWindow((HWND)m_hGripper, show ? SW_SHOW : SW_HIDE);
+}

 
 

-    if ( closing.Member(this) )
-        return;
+void wxDialog::ResizeGripper()
+{
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
 

-    closing.Append(this);
+    HWND hwndGripper = (HWND)m_hGripper;

 
 

-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    cancelEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
+    const wxRect rectGripper = wxRectFromRECT(wxGetWindowRect(hwndGripper));
+    const wxSize size = GetClientSize() - rectGripper.GetSize();

 
 

-    closing.DeleteObject(this);
+    ::SetWindowPos(hwndGripper, HWND_BOTTOM,
+                   size.x, size.y,
+                   rectGripper.width, rectGripper.height,
+                   SWP_NOACTIVATE);

 }
 
 }
 

-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+void wxDialog::OnWindowCreate(wxWindowCreateEvent& event)

 {
 {

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
+    if ( m_hGripper && IsShown() &&
+            event.GetWindow() && event.GetWindow()->GetParent() == this )
+    {
+        // Put gripper below the newly created child window
+        ::SetWindowPos((HWND)m_hGripper, HWND_BOTTOM, 0, 0, 0, 0,
+                       SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
+    }
+
+    event.Skip();

 }
 
 }
 

+#endif // wxUSE_DIALOG_SIZEGRIP
+
+// ----------------------------------------------------------------------------
+// wxWin event handlers
+// ----------------------------------------------------------------------------
+

 #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()
 {
 #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()
 {

-    wxButton *btn = wxDynamicCast(FindWindow(GetAffirmativeId()), wxButton);
-
-    if ( btn && btn->IsEnabled() )
-    {
-        // If we have this button, press it
-        btn->MSWCommand(BN_CLICKED, 0 /* unused */);
+    const int idOk = GetAffirmativeId();
+    if ( EmulateButtonClickIfPresent(idOk) )

         return true;
         return true;

-    }
-    else
-    {
-        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
-        event.SetEventObject(this);

 
 

-        return GetEventHandler()->ProcessEvent(event);
-    }    
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+    event.SetEventObject(this);
+
+    return HandleWindowEvent(event);

 }
 }

-#endif
+#endif // __POCKETPC__

 
 

+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+// create main toolbar by calling OnCreateToolBar()
+wxToolBar* wxDialog::CreateToolBar(long style, wxWindowID winid, const wxString& name)
+{
+    m_dialogToolBar = OnCreateToolBar(style, winid, name);
+
+    return m_dialogToolBar;
+}
+
+// return a new toolbar
+wxToolBar *wxDialog::OnCreateToolBar(long style,
+                                       wxWindowID winid,
+                                       const wxString& name)
+{
+    return new wxToolMenuBar(this, winid,
+                         wxDefaultPosition, wxDefaultSize,
+                         style, name);
+}
+#endif

 
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------

-// dialog window proc
+// dialog Windows messages processing

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


@@ -498,6 +463,21 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             break;
 
         case WM_SIZE:
             break;
 
         case WM_SIZE:

+#if wxUSE_DIALOG_SIZEGRIP
+            if ( m_hGripper )
+            {
+                switch ( wParam )
+                {
+                    case SIZE_MAXIMIZED:
+                        ShowGripper(false);
+                        break;
+
+                    case SIZE_RESTORED:
+                        ShowGripper(true);
+                }
+            }
+#endif // wxUSE_DIALOG_SIZEGRIP
+

             // 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
             // 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


@@ -546,4 +526,3 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
 
     return rc;
 }
 
     return rc;
 }

-