Test using wxString::ToCDouble() in wxAny.

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 1b66274cc16b0364215816807f21935a469ee5a9..ccab43d45ef18a72bbe17c21dfdf82344670d5d5 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/dialog.h"
 #endif
 
 #include "wx/dialog.h"

+#include "wx/testing.h"

 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"


@@ -40,7 +41,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"


@@ -50,64 +51,6 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxDialogStyle )
-
-wxBEGIN_FLAGS( wxDialogStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxNO_BORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-
-    // dialog styles
-    wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
-    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
-    wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxSYSTEM_MENU)
-    wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxCLOSE_BOX)
-    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
-    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-wxEND_FLAGS( wxDialogStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxDialog)
-    wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxDialog)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-#endif
-

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


@@ -145,14 +88,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 +108,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,6 +124,7 @@ bool wxDialog::Create(wxWindow *parent,
     CreateToolBar();
 #endif
 
     CreateToolBar();
 #endif
 

+#if wxUSE_DIALOG_SIZEGRIP

     if ( HasFlag(wxRESIZE_BORDER) )
     {
         CreateGripper();
     if ( HasFlag(wxRESIZE_BORDER) )
     {
         CreateGripper();


@@ -191,46 +132,25 @@ bool wxDialog::Create(wxWindow *parent,
         Connect(wxEVT_CREATE,
                 wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
     }
         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() )


@@ -275,64 +195,23 @@ bool wxDialog::Show(bool show)
     return true;
 }
 
     return true;
 }
 

-void wxDialog::Raise()
-{
-    ::SetForegroundWindow(GetHwnd());
-}
-

 // show dialog modally
 int wxDialog::ShowModal()
 {
 // show dialog modally
 int wxDialog::ShowModal()
 {

-    wxASSERT_MSG( !IsModal(), _T("ShowModal() can't be called twice") );
+    WX_TESTING_SHOW_MODAL_HOOK();

 
 

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


@@ -340,9 +219,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();


@@ -352,6 +230,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);


@@ -391,9 +271,12 @@ void wxDialog::DestroyGripper()
     {
         // we used to have trouble with gripper appearing on top (and hence
         // overdrawing) the other, real, dialog children -- check that this
     {
         // 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
-        wxASSERT_MSG( ::GetNextWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,
-            _T("Bug in wxWidgets: gripper should be at the bottom of Z-order") );
+        // 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;
     }


@@ -401,7 +284,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();


@@ -411,7 +294,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;
 


@@ -437,6 +320,8 @@ void wxDialog::OnWindowCreate(wxWindowCreateEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+#endif // wxUSE_DIALOG_SIZEGRIP
+

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


@@ -451,7 +336,7 @@ bool wxDialog::DoOK()
     if ( EmulateButtonClickIfPresent(idOk) )
         return true;
 
     if ( EmulateButtonClickIfPresent(idOk) )
         return true;
 

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+    wxCommandEvent event(wxEVT_BUTTON, GetAffirmativeId());

     event.SetEventObject(this);
 
     return HandleWindowEvent(event);
     event.SetEventObject(this);
 
     return HandleWindowEvent(event);


@@ -518,6 +403,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 )


@@ -530,8 +416,9 @@ 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
+            // 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
             // 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


@@ -554,7 +441,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             {
                 // set our cursor for all windows (but see below)
                 wxCursor cursor = m_cursor;
             {
                 // set our cursor for all windows (but see below)
                 wxCursor cursor = m_cursor;

-                if ( !cursor.Ok() )
+                if ( !cursor.IsOk() )

                     cursor = wxCURSOR_ARROW;
 
                 ::SetCursor(GetHcursorOf(cursor));
                     cursor = wxCURSOR_ARROW;
 
                 ::SetCursor(GetHcursorOf(cursor));


@@ -575,7 +462,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
     }
 
     if ( !processed )
     }
 
     if ( !processed )

-        rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+        rc = wxDialogBase::MSWWindowProc(message, wParam, lParam);

 
     return rc;
 }
 
     return rc;
 }