Add support for IEC and SI size units to wxFileName::GetHumanReadableSize().

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 0a923fccce87413cb2ca49c6031f4217c065fee3..592c23a9bc2252bef135cfe23243e2d5247e351f 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -40,7 +40,7 @@
 
 #include "wx/msw/private.h"
 #include "wx/evtloop.h"
 
 #include "wx/msw/private.h"
 #include "wx/evtloop.h"

-#include "wx/ptr_scpd.h"
+#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"


@@ -145,14 +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_TOOLBAR && defined(__POCKETPC__)
     m_dialogToolBar = NULL;
 #endif

+#if wxUSE_DIALOG_SIZEGRIP

     m_hGripper = 0;
     m_hGripper = 0;

+#endif // wxUSE_DIALOG_SIZEGRIP

 }
 
 bool wxDialog::Create(wxWindow *parent,
 }
 
 bool wxDialog::Create(wxWindow *parent,


@@ -165,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;
 


@@ -184,48 +181,33 @@ bool wxDialog::Create(wxWindow *parent,
     CreateToolBar();
 #endif
 
     CreateToolBar();
 #endif
 

+#if wxUSE_DIALOG_SIZEGRIP

     if ( HasFlag(wxRESIZE_BORDER) )
     if ( HasFlag(wxRESIZE_BORDER) )

+    {

         CreateGripper();
 
         CreateGripper();
 

+        Connect(wxEVT_CREATE,
+                wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
+    }
+#endif // wxUSE_DIALOG_SIZEGRIP
+

     return true;
 }
 
 wxDialog::~wxDialog()
 {
     return true;
 }
 
 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();
     DestroyGripper();

+#endif // wxUSE_DIALOG_SIZEGRIP

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

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


@@ -256,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;


@@ -276,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();


@@ -333,9 +279,8 @@ 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();


@@ -345,6 +290,8 @@ void wxDialog::EndModal(int retCode)
 // wxDialog gripper handling
 // ----------------------------------------------------------------------------
 
 // wxDialog gripper handling
 // ----------------------------------------------------------------------------
 

+#if wxUSE_DIALOG_SIZEGRIP
+

 void wxDialog::SetWindowStyleFlag(long style)
 {
     wxDialogBase::SetWindowStyleFlag(style);
 void wxDialog::SetWindowStyleFlag(long style)
 {
     wxDialogBase::SetWindowStyleFlag(style);


@@ -382,6 +329,14 @@ void wxDialog::DestroyGripper()
 {
     if ( m_hGripper )
     {
 {
     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;
     }
         ::DestroyWindow((HWND) m_hGripper);
         m_hGripper = 0;
     }


@@ -389,7 +344,7 @@ void wxDialog::DestroyGripper()
 
 void wxDialog::ShowGripper(bool show)
 {
 
 void wxDialog::ShowGripper(bool show)
 {

-    wxASSERT_MSG( m_hGripper, _T("shouldn't be called if we have no gripper") );
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
     if ( show )
         ResizeGripper();
 
     if ( show )
         ResizeGripper();


@@ -399,7 +354,7 @@ void wxDialog::ShowGripper(bool show)
 
 void wxDialog::ResizeGripper()
 {
 
 void wxDialog::ResizeGripper()
 {

-    wxASSERT_MSG( m_hGripper, _T("shouldn't be called if we have no gripper") );
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
     HWND hwndGripper = (HWND)m_hGripper;
 
 
     HWND hwndGripper = (HWND)m_hGripper;
 


@@ -412,6 +367,21 @@ void wxDialog::ResizeGripper()
                    SWP_NOACTIVATE);
 }
 
                    SWP_NOACTIVATE);
 }
 

+void wxDialog::OnWindowCreate(wxWindowCreateEvent& event)
+{
+    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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin event handlers
 // ----------------------------------------------------------------------------


@@ -493,6 +463,7 @@ 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 )
             if ( m_hGripper )
             {
                 switch ( wParam )


@@ -505,6 +476,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
                         ShowGripper(true);
                 }
             }
                         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
 
             // the Windows dialogs unfortunately are not meant to be resizeable
             // at all and their standard class doesn't include CS_[VH]REDRAW


@@ -520,20 +492,6 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             }
             break;
 
             }
             break;
 

-        case WM_WINDOWPOSCHANGED:
-            {
-                WINDOWPOS * const wp = wx_reinterpret_cast(WINDOWPOS *, lParam);
-                if ( wp->flags & SWP_SHOWWINDOW )
-                {
-                    // we should only show it now to ensure that it's really
-                    // positioned underneath under all the other controls in
-                    // the dialog, if we showed it before it could overlap them
-                    if ( m_hGripper )
-                        ShowGripper(true);
-                }
-            }
-            break;
-

 #ifndef __WXMICROWIN__
         case WM_SETCURSOR:
             // we want to override the busy cursor for modal dialogs:
 #ifndef __WXMICROWIN__
         case WM_SETCURSOR:
             // we want to override the busy cursor for modal dialogs: