missing commit

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

diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 27711a8dc0d08a8d047f0cc4d06b898dd6bc5bf7..7f27803410907ed96cf3f08553a7e03f4d848a42 100644 (file)
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -27,20 +27,19 @@
 #if wxUSE_FINDREPLDLG
 
 #ifndef WX_PRECOMP
 #if wxUSE_FINDREPLDLG
 
 #ifndef WX_PRECOMP

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

     #include "wx/intl.h"
     #include "wx/log.h"
 #endif
 
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif
 

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

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

+#include "wx/msw/mslu.h"
+

 // ----------------------------------------------------------------------------
 // functions prototypes
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // functions prototypes
 // ----------------------------------------------------------------------------
 

-LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
-                                       WPARAM wParam, LPARAM lParam);
-

 UINT_PTR CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
                                               UINT uiMsg,
                                               WPARAM wParam,
 UINT_PTR CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
                                               UINT uiMsg,
                                               WPARAM wParam,


@@ -65,10 +64,6 @@ public:
     void InitFindWhat(const wxString& str);
     void InitReplaceWith(const wxString& str);
 
     void InitFindWhat(const wxString& str);
     void InitReplaceWith(const wxString& str);
 

-    void SubclassDialog(HWND hwnd);
-
-    static UINT GetFindDialogMessage() { return ms_msgFindDialog; }
-

     // only for passing to ::FindText or ::ReplaceText
     FINDREPLACE *GetPtrFindReplace() { return &m_findReplace; }
 
     // only for passing to ::FindText or ::ReplaceText
     FINDREPLACE *GetPtrFindReplace() { return &m_findReplace; }
 


@@ -77,13 +72,15 @@ public:
     bool WasClosedByUser() const { return m_wasClosedByUser; }
 
 private:
     bool WasClosedByUser() const { return m_wasClosedByUser; }
 
 private:

-    void InitString(const wxString& str, LPTSTR *ppStr, WORD *pLen);
+    // called from window procedure for ms_msgFindDialog
+    static bool FindMessageHandler(wxWindow *win,
+                                   WXUINT nMsg,
+                                   WPARAM wParam,
+                                   LPARAM lParam);

 
 

-    // the owner of the dialog
-    HWND m_hwndOwner;
+    // copy string str contents to ppStr and fill pLen with its length
+    void InitString(const wxString& str, LPTSTR *ppStr, WORD *pLen);

 
 

-    // the previous window proc of our owner
-    WNDPROC m_oldParentWndProc;

 
     // the find replace data used by the dialog
     FINDREPLACE m_findReplace;
 
     // the find replace data used by the dialog
     FINDREPLACE m_findReplace;


@@ -94,7 +91,7 @@ private:
     // registered Message for Dialog
     static UINT ms_msgFindDialog;
 
     // registered Message for Dialog
     static UINT ms_msgFindDialog;
 

-    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl)
+    wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl);

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


@@ -117,12 +114,15 @@ wxFindReplaceDialogImpl::wxFindReplaceDialogImpl(wxFindReplaceDialog *dialog,
 
         if ( !ms_msgFindDialog )
         {
 
         if ( !ms_msgFindDialog )
         {

-            wxLogLastError(_T("RegisterWindowMessage(FINDMSGSTRING)"));
+            wxLogLastError(wxT("RegisterWindowMessage(FINDMSGSTRING)"));

         }
         }

-    }

 
 

-    m_hwndOwner = NULL;
-    m_oldParentWndProc = NULL;
+        wxWindow::MSWRegisterMessageHandler
+                  (
+                    ms_msgFindDialog,
+                    &wxFindReplaceDialogImpl::FindMessageHandler
+                  );
+    }

 
     m_wasClosedByUser = false;
 
 
     m_wasClosedByUser = false;
 


@@ -184,41 +184,21 @@ void wxFindReplaceDialogImpl::InitReplaceWith(const wxString& str)
                &m_findReplace.wReplaceWithLen);
 }
 
                &m_findReplace.wReplaceWithLen);
 }
 

-void wxFindReplaceDialogImpl::SubclassDialog(HWND hwnd)
-{
-    m_hwndOwner = 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
-    wxCHECK_RET( wxGetWindowProc(hwnd) !=
-                        wx_reinterpret_cast(void *, wxFindReplaceWindowProc),
-                 _T("can't have more than one find dialog currently") );
-
-    // set the new one and save the old as user data to allow access to it
-    // from wxFindReplaceWindowProc
-    m_oldParentWndProc = wxSetWindowProc(hwnd, wxFindReplaceWindowProc);
-
-    wxSetWindowUserData(hwnd, (void *)m_oldParentWndProc);
-}
-

 wxFindReplaceDialogImpl::~wxFindReplaceDialogImpl()
 {
     delete [] m_findReplace.lpstrFindWhat;
     delete [] m_findReplace.lpstrReplaceWith;
 wxFindReplaceDialogImpl::~wxFindReplaceDialogImpl()
 {
     delete [] m_findReplace.lpstrFindWhat;
     delete [] m_findReplace.lpstrReplaceWith;

-
-    if ( m_hwndOwner )
-    {
-        // undo subclassing
-        wxSetWindowProc(m_hwndOwner, m_oldParentWndProc);
-    }

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

-// Window Proc for handling RegisterWindowMessage(FINDMSGSTRING)
+// handler for FINDMSGSTRING message

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

-LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
-                                         WPARAM wParam, LPARAM lParam)
+bool
+wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win),
+                                            WXUINT WXUNUSED_UNLESS_DEBUG(nMsg),
+                                            WPARAM WXUNUSED(wParam),
+                                            LPARAM lParam)

 {
 #if wxUSE_UNICODE_MSLU
     static unsigned long s_lastMsgFlags = 0;
 {
 #if wxUSE_UNICODE_MSLU
     static unsigned long s_lastMsgFlags = 0;


@@ -230,100 +210,89 @@ LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
     static bool s_blockMsg = false;
 #endif // wxUSE_UNICODE_MSLU
 
     static bool s_blockMsg = false;
 #endif // wxUSE_UNICODE_MSLU
 

-    if ( nMsg == wxFindReplaceDialogImpl::GetFindDialogMessage() )
-    {
-        FINDREPLACE *pFR = (FINDREPLACE *)lParam;
+    wxASSERT_MSG( nMsg == ms_msgFindDialog, wxT("unexpected message received") );
+
+    FINDREPLACE *pFR = (FINDREPLACE *)lParam;

 
 #if wxUSE_UNICODE_MSLU
 
 #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 ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags )
-        {
-            s_lastMsgFlags = 0;
-            return 0;
-        }
-        s_lastMsgFlags = pFR->Flags;
+    // 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 let's ignore
+    // the second bogus message
+    if ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags )
+    {
+        s_lastMsgFlags = 0;
+        return 0;
+    }
+    s_lastMsgFlags = pFR->Flags;

 #endif // wxUSE_UNICODE_MSLU
 
 #endif // wxUSE_UNICODE_MSLU
 

-        wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
+    wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;

 
 

-        // map flags from Windows
-        wxEventType evtType;
+    // map flags from Windows
+    wxEventType evtType;

 
 

-        bool replace = false;
-        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();
+    bool replace = false;
+    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_NEXT;
-        }
-        else if ( pFR->Flags & FR_REPLACE )
-        {
-            evtType = wxEVT_COMMAND_FIND_REPLACE;
+        evtType = wxEVT_FIND_CLOSE;
+    }
+    else if ( pFR->Flags & FR_FINDNEXT )
+    {
+        evtType = wxEVT_FIND_NEXT;
+    }
+    else if ( pFR->Flags & FR_REPLACE )
+    {
+        evtType = wxEVT_FIND_REPLACE;

 
 

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

 
 

-            replace = true;
-        }
-        else
-        {
-            wxFAIL_MSG( _T("unknown find dialog event") );
+        replace = true;
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("unknown find dialog event") );

 
 

-            return 0;
-        }
+        return 0;
+    }

 
 

-        wxUint32 flags = 0;
-        if ( pFR->Flags & FR_DOWN )
-            flags |= wxFR_DOWN;
-        if ( pFR->Flags & FR_WHOLEWORD )
-            flags |= wxFR_WHOLEWORD;
-        if ( pFR->Flags & FR_MATCHCASE )
-            flags |= wxFR_MATCHCASE;
-
-        wxFindDialogEvent event(evtType, dialog->GetId());
-        event.SetEventObject(dialog);
-        event.SetFlags(flags);
-        event.SetFindString(pFR->lpstrFindWhat);
-        if ( replace )
-        {
-            event.SetReplaceString(pFR->lpstrReplaceWith);
-        }
+    wxUint32 flags = 0;
+    if ( pFR->Flags & FR_DOWN )
+        flags |= wxFR_DOWN;
+    if ( pFR->Flags & FR_WHOLEWORD )
+        flags |= wxFR_WHOLEWORD;
+    if ( pFR->Flags & FR_MATCHCASE )
+        flags |= wxFR_MATCHCASE;
+
+    wxFindDialogEvent event(evtType, dialog->GetId());
+    event.SetEventObject(dialog);
+    event.SetFlags(flags);
+    event.SetFindString(pFR->lpstrFindWhat);
+    if ( replace )
+    {
+        event.SetReplaceString(pFR->lpstrReplaceWith);
+    }

 
 #if wxUSE_UNICODE_MSLU
 
 #if wxUSE_UNICODE_MSLU

-        s_blockMsg = true;
+    s_blockMsg = true;

 #endif // wxUSE_UNICODE_MSLU
 
 #endif // wxUSE_UNICODE_MSLU
 

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

 
 #if wxUSE_UNICODE_MSLU
 
 #if wxUSE_UNICODE_MSLU

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

 #endif // wxUSE_UNICODE_MSLU
 
 #endif // wxUSE_UNICODE_MSLU
 

-    WNDPROC wndProc = (WNDPROC)wxGetWindowUserData(hwnd);
-
-    // sanity check
-    wxASSERT_MSG( wndProc != wxFindReplaceWindowProc,
-                  _T("infinite recursion detected") );
-
-    return ::CallWindowProc(wndProc, hwnd, nMsg, wParam, lParam);
+    return true;

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


@@ -341,7 +310,7 @@ wxFindReplaceDialogHookProc(HWND hwnd,
         FINDREPLACE *pFR = (FINDREPLACE *)lParam;
         wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
 
         FINDREPLACE *pFR = (FINDREPLACE *)lParam;
         wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
 

-        ::SetWindowText(hwnd, dialog->GetTitle());
+        ::SetWindowText(hwnd, dialog->GetTitle().t_str());

 
         // don't return FALSE from here or the dialog won't be shown
         return TRUE;
 
         // don't return FALSE from here or the dialog won't be shown
         return TRUE;


@@ -380,20 +349,23 @@ 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 ( m_impl )

     {
     {

-        // if it wasn't, delete the dialog ourselves
-        if ( !::DestroyWindow(GetHwnd()) )
+        // 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 flag must have been set
+        if ( !m_impl->WasClosedByUser() )

         {
         {

-            wxLogLastError(_T("DestroyWindow(find dialog)"));
+            // if it wasn't, delete the dialog ourselves
+            if ( !::DestroyWindow(GetHwnd()) )
+            {
+                wxLogLastError(wxT("DestroyWindow(find dialog)"));
+            }

         }
         }

-    }

 
 

-    // unsubclass the parent
-    delete m_impl;
+        // unsubclass the parent
+        delete m_impl;
+    }

 
     // prevent the base class dtor from trying to hide us!
     m_isShown = false;
 
     // prevent the base class dtor from trying to hide us!
     m_isShown = false;


@@ -444,9 +416,9 @@ bool wxFindReplaceDialog::Show(bool show)
         return true;
     }
 
         return true;
     }
 

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

 
 

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

 
     m_impl = new wxFindReplaceDialogImpl(this, m_FindReplaceData->GetFlags());
 
 
     m_impl = new wxFindReplaceDialogImpl(this, m_FindReplaceData->GetFlags());
 


@@ -471,18 +443,14 @@ bool wxFindReplaceDialog::Show(bool show)
         wxLogError(_("Failed to create the standard find/replace dialog (error code %d)"),
                    ::CommDlgExtendedError());
 
         wxLogError(_("Failed to create the standard find/replace dialog (error code %d)"),
                    ::CommDlgExtendedError());
 

-        delete m_impl;
-        m_impl = NULL;
+        wxDELETE(m_impl);

 
         return false;
     }
 
 
         return false;
     }
 

-    // subclass parent window in order to get FINDMSGSTRING message
-    m_impl->SubclassDialog(GetHwndOf(m_parent));
-

     if ( !::ShowWindow(hwnd, SW_SHOW) )
     {
     if ( !::ShowWindow(hwnd, SW_SHOW) )
     {

-        wxLogLastError(_T("ShowWindow(find dialog)"));
+        wxLogLastError(wxT("ShowWindow(find dialog)"));

     }
 
     m_hWnd = (WXHWND)hwnd;
     }
 
     m_hWnd = (WXHWND)hwnd;


@@ -540,4 +508,3 @@ void wxFindReplaceDialog::DoGetClientSize(int *width, int *height) const
 }
 
 #endif // wxUSE_FINDREPLDLG
 }
 
 #endif // wxUSE_FINDREPLDLG

-