Switch deferred sizing off by default

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

diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 0d34834244735f4eee9afda48dc78fcfa7bd881d..7eab0dae8d707ea8faeba638a0fe7476de259c7d 100644 (file)
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "mswfdrepdlg.h"
 #endif
 
     #pragma implementation "mswfdrepdlg.h"
 #endif
 


@@ -35,12 +35,7 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#include "wx/msw/private.h"
-
-#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
-    #include <commdlg.h>
-#endif
-
+#include "wx/msw/wrapcdlg.h"

 #include "wx/fdrepdlg.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/fdrepdlg.h"
 
 // ----------------------------------------------------------------------------


@@ -50,10 +45,10 @@
 LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
                                        WPARAM wParam, LPARAM lParam);
 
 LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
                                        WPARAM wParam, LPARAM lParam);
 

-UINT CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
-                                          UINT uiMsg,
-                                          WPARAM wParam,
-                                          LPARAM lParam);
+UINT_PTR CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
+                                              UINT uiMsg,
+                                              WPARAM wParam,
+                                              LPARAM lParam);

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -81,6 +76,10 @@ public:
     // only for passing to ::FindText or ::ReplaceText
     FINDREPLACE *GetPtrFindReplace() { return &m_findReplace; }
 
     // only for passing to ::FindText or ::ReplaceText
     FINDREPLACE *GetPtrFindReplace() { return &m_findReplace; }
 

+    // set/query the "closed by user" flag
+    void SetClosedByUser() { m_wasClosedByUser = true; }
+    bool WasClosedByUser() const { return m_wasClosedByUser; }
+

 private:
     void InitString(const wxString& str, LPTSTR *ppStr, WORD *pLen);
 
 private:
     void InitString(const wxString& str, LPTSTR *ppStr, WORD *pLen);
 


@@ -93,8 +92,13 @@ private:
     // the find replace data used by the dialog
     FINDREPLACE m_findReplace;
 
     // the find replace data used by the dialog
     FINDREPLACE m_findReplace;
 

+    // true if the user closed us, false otherwise
+    bool m_wasClosedByUser;
+

     // registered Message for Dialog
     static UINT ms_msgFindDialog;
     // registered Message for Dialog
     static UINT ms_msgFindDialog;

+
+    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl)

 };
 
 UINT wxFindReplaceDialogImpl::ms_msgFindDialog = 0;
 };
 
 UINT wxFindReplaceDialogImpl::ms_msgFindDialog = 0;


@@ -124,6 +128,8 @@ wxFindReplaceDialogImpl::wxFindReplaceDialogImpl(wxFindReplaceDialog *dialog,
     m_hwndOwner = NULL;
     m_oldParentWndProc = NULL;
 
     m_hwndOwner = NULL;
     m_oldParentWndProc = NULL;
 

+    m_wasClosedByUser = false;
+

     wxZeroMemory(m_findReplace);
 
     // translate the flags: first the dialog creation flags
     wxZeroMemory(m_findReplace);
 
     // translate the flags: first the dialog creation flags


@@ -167,7 +173,7 @@ void wxFindReplaceDialogImpl::InitString(const wxString& str,
 
     *ppStr = new wxChar[len];
     wxStrcpy(*ppStr, str);
 
     *ppStr = new wxChar[len];
     wxStrcpy(*ppStr, str);

-    *pLen = len;
+    *pLen = (WORD)len;

 }
 
 void wxFindReplaceDialogImpl::InitFindWhat(const wxString& str)
 }
 
 void wxFindReplaceDialogImpl::InitFindWhat(const wxString& str)


@@ -188,17 +194,13 @@ void wxFindReplaceDialogImpl::SubclassDialog(HWND hwnd)
 
     // check that we don't subclass the parent twice: this would be a bad idea
     // as then we'd have infinite recursion in wxFindReplaceWindowProc
 
     // check that we don't subclass the parent twice: this would be a bad idea
     // as then we'd have infinite recursion in wxFindReplaceWindowProc

-    WNDPROC oldParentWndProc = (WNDPROC)::GetWindowLong(hwnd, GWL_WNDPROC);
-
-    if ( oldParentWndProc != wxFindReplaceWindowProc )
+    if ( !wxCheckWindowWndProc((WXHWND)hwnd, (WXFARPROC)wxFindReplaceWindowProc) )

     {
     {

-        // save old wnd proc elsewhere to access it from
-        // wxFindReplaceWindowProc
-        m_oldParentWndProc = oldParentWndProc;
-        (void)::SetWindowLong(hwnd, GWL_USERDATA, (LONG)oldParentWndProc);
+        // set the new one and save the old as user data to allow access to it
+        // from wxFindReplaceWindowProc
+        m_oldParentWndProc = wxSetWindowProc(hwnd, wxFindReplaceWindowProc);

 
 

-        // and set the new one
-        (void)::SetWindowLong(hwnd, GWL_WNDPROC, (LONG)wxFindReplaceWindowProc);
+        wxSetWindowUserData(hwnd, (void *)m_oldParentWndProc);

     }
 }
 
     }
 }
 


@@ -209,7 +211,8 @@ wxFindReplaceDialogImpl::~wxFindReplaceDialogImpl()
 
     if ( m_hwndOwner )
     {
 
     if ( m_hwndOwner )
     {

-        ::SetWindowLong(m_hwndOwner, GWL_WNDPROC, (LONG)m_oldParentWndProc);
+        // undo subclassing
+        wxSetWindowProc(m_hwndOwner, m_oldParentWndProc);

     }
 }
 
     }
 }
 


@@ -220,17 +223,46 @@ wxFindReplaceDialogImpl::~wxFindReplaceDialogImpl()
 LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
                                          WPARAM wParam, LPARAM lParam)
 {
 LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
                                          WPARAM wParam, LPARAM lParam)
 {

+#if wxUSE_UNICODE_MSLU
+    static unsigned long s_lastMsgFlags = 0;
+
+    // This flag helps us to identify the bogus ANSI message
+    // sent by UNICOWS.DLL (see below)
+    // while we're sending our message to the dialog
+    // we ignore possible messages sent in between
+    static bool s_blockMsg = false;
+#endif // wxUSE_UNICODE_MSLU
+

     if ( nMsg == wxFindReplaceDialogImpl::GetFindDialogMessage() )
     {
         FINDREPLACE *pFR = (FINDREPLACE *)lParam;
     if ( nMsg == wxFindReplaceDialogImpl::GetFindDialogMessage() )
     {
         FINDREPLACE *pFR = (FINDREPLACE *)lParam;

+
+#if wxUSE_UNICODE_MSLU
+        // This is a hack for a MSLU problem: Versions up to 1.0.4011
+        // of UNICOWS.DLL send the correct UNICODE item after button press
+        // and a bogus ANSI mode item right after this, so lets ignore
+        // the second bogus message
+        if ( s_lastMsgFlags == pFR->Flags )
+        {
+            s_lastMsgFlags = 0;
+            return 0;
+        }
+        s_lastMsgFlags = pFR->Flags;
+#endif // wxUSE_UNICODE_MSLU
+

         wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
 
         // map flags from Windows
         wxEventType evtType;
 
         wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
 
         // map flags from Windows
         wxEventType evtType;
 

-        bool replace = FALSE;
+        bool replace = false;

         if ( pFR->Flags & FR_DIALOGTERM )
         {
         if ( pFR->Flags & FR_DIALOGTERM )
         {

+            // we have to notify the dialog that it's being closed by user and
+            // not deleted programmatically as it behaves differently in these
+            // 2 cases
+            dialog->GetImpl()->SetClosedByUser();
+

             evtType = wxEVT_COMMAND_FIND_CLOSE;
         }
         else if ( pFR->Flags & FR_FINDNEXT )
             evtType = wxEVT_COMMAND_FIND_CLOSE;
         }
         else if ( pFR->Flags & FR_FINDNEXT )


@@ -241,13 +273,13 @@ LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
         {
             evtType = wxEVT_COMMAND_FIND_REPLACE;
 
         {
             evtType = wxEVT_COMMAND_FIND_REPLACE;
 

-            replace = TRUE;
+            replace = true;

         }
         else if ( pFR->Flags & FR_REPLACEALL )
         {
             evtType = wxEVT_COMMAND_FIND_REPLACE_ALL;
 
         }
         else if ( pFR->Flags & FR_REPLACEALL )
         {
             evtType = wxEVT_COMMAND_FIND_REPLACE_ALL;
 

-            replace = TRUE;
+            replace = true;

         }
         else
         {
         }
         else
         {


@@ -273,10 +305,22 @@ LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
             event.SetReplaceString(pFR->lpstrReplaceWith);
         }
 
             event.SetReplaceString(pFR->lpstrReplaceWith);
         }
 

+#if wxUSE_UNICODE_MSLU
+        s_blockMsg = true;
+#endif // wxUSE_UNICODE_MSLU
+

         dialog->Send(event);
         dialog->Send(event);

+
+#if wxUSE_UNICODE_MSLU
+        s_blockMsg = false;
+#endif // wxUSE_UNICODE_MSLU

     }
     }

+#if wxUSE_UNICODE_MSLU
+    else if ( !s_blockMsg )
+        s_lastMsgFlags = 0;
+#endif // wxUSE_UNICODE_MSLU

 
 

-    WNDPROC wndProc = (WNDPROC)::GetWindowLong(hwnd, GWL_USERDATA);
+    WNDPROC wndProc = (WNDPROC)wxGetWindowUserData(hwnd);

 
     // sanity check
     wxASSERT_MSG( wndProc != wxFindReplaceWindowProc,
 
     // sanity check
     wxASSERT_MSG( wndProc != wxFindReplaceWindowProc,


@@ -289,10 +333,11 @@ LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
 // Find/replace dialog hook proc
 // ----------------------------------------------------------------------------
 
 // Find/replace dialog hook proc
 // ----------------------------------------------------------------------------
 

-UINT CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
-                                          UINT uiMsg,
-                                          WPARAM WXUNUSED(wParam),
-                                          LPARAM lParam)
+UINT_PTR CALLBACK
+wxFindReplaceDialogHookProc(HWND hwnd,
+                            UINT uiMsg,
+                            WPARAM WXUNUSED(wParam),
+                            LPARAM lParam)

 {
     if ( uiMsg == WM_INITDIALOG )
     {
 {
     if ( uiMsg == WM_INITDIALOG )
     {


@@ -322,7 +367,7 @@ void wxFindReplaceDialog::Init()
     m_FindReplaceData = NULL;
 
     // as we're created in the hidden state, bring the internal flag in sync
     m_FindReplaceData = NULL;
 
     // as we're created in the hidden state, bring the internal flag in sync

-    m_isShown = FALSE;
+    m_isShown = false;

 }
 
 wxFindReplaceDialog::wxFindReplaceDialog(wxWindow *parent,
 }
 
 wxFindReplaceDialog::wxFindReplaceDialog(wxWindow *parent,


@@ -338,13 +383,25 @@ wxFindReplaceDialog::wxFindReplaceDialog(wxWindow *parent,
 
 wxFindReplaceDialog::~wxFindReplaceDialog()
 {
 
 wxFindReplaceDialog::~wxFindReplaceDialog()
 {

+    // the dialog might have been already deleted if the user closed it
+    // manually but in this case we should have got a notification about it and
+    // the flagmust have been set
+    if ( !m_impl->WasClosedByUser() )
+    {
+        // if it wasn't, delete the dialog ourselves
+        if ( !::DestroyWindow(GetHwnd()) )
+        {
+            wxLogLastError(_T("DestroyWindow(find dialog)"));
+        }
+    }
+

     // unsubclass the parent
     delete m_impl;
 
     // prevent the base class dtor from trying to hide us!
     // unsubclass the parent
     delete m_impl;
 
     // prevent the base class dtor from trying to hide us!

-    m_isShown = FALSE;
+    m_isShown = false;

 
 

-    // and from destroying our window
+    // and from destroying our window [again]

     m_hWnd = (WXHWND)NULL;
 }
 
     m_hWnd = (WXHWND)NULL;
 }
 


@@ -372,7 +429,7 @@ bool wxFindReplaceDialog::Show(bool show)
     if ( !wxWindowBase::Show(show) )
     {
         // visibility status didn't change
     if ( !wxWindowBase::Show(show) )
     {
         // visibility status didn't change

-        return FALSE;
+        return false;

     }
 
     // do we already have the dialog window?
     }
 
     // do we already have the dialog window?


@@ -381,16 +438,16 @@ bool wxFindReplaceDialog::Show(bool show)
         // yes, just use it
         (void)::ShowWindow(GetHwnd(), show ? SW_SHOW : SW_HIDE);
 
         // yes, just use it
         (void)::ShowWindow(GetHwnd(), show ? SW_SHOW : SW_HIDE);
 

-        return TRUE;
+        return true;

     }
 
     if ( !show )
     {
         // well, it doesn't exist which is as good as being hidden
     }
 
     if ( !show )
     {
         // well, it doesn't exist which is as good as being hidden

-        return TRUE;
+        return true;

     }
 
     }
 

-    wxCHECK_MSG( m_FindReplaceData, FALSE, _T("call Create() first!") );
+    wxCHECK_MSG( m_FindReplaceData, false, _T("call Create() first!") );

 
     wxASSERT_MSG( !m_impl, _T("why don't we have the window then?") );
 
 
     wxASSERT_MSG( !m_impl, _T("why don't we have the window then?") );
 


@@ -420,7 +477,7 @@ bool wxFindReplaceDialog::Show(bool show)
         delete m_impl;
         m_impl = NULL;
 
         delete m_impl;
         m_impl = NULL;
 

-        return FALSE;
+        return false;

     }
 
     // subclass parent window in order to get FINDMSGSTRING message
     }
 
     // subclass parent window in order to get FINDMSGSTRING message


@@ -433,7 +490,7 @@ bool wxFindReplaceDialog::Show(bool show)
 
     m_hWnd = (WXHWND)hwnd;
 
 
     m_hWnd = (WXHWND)hwnd;
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------