Eliminated bizarre VC++ internal compiler errors, perhaps related to

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

diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index aac3a0720264942d041114d000c97d7791c294ea..7c533fb4a321284b31e0632f233b070ff9074df8 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
 


@@ -37,7 +37,7 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
+#if !defined(__WIN32__) || defined(__WXWINCE__)

     #include <commdlg.h>
 #endif
 
     #include <commdlg.h>
 #endif
 


@@ -81,6 +81,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 +97,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 +133,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


@@ -188,10 +199,9 @@ 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) )

     {
     {

+        WNDPROC oldParentWndProc = (WNDPROC)::GetWindowLong(hwnd, GWL_WNDPROC);

         // save old wnd proc elsewhere to access it from
         // wxFindReplaceWindowProc
         m_oldParentWndProc = oldParentWndProc;
         // save old wnd proc elsewhere to access it from
         // wxFindReplaceWindowProc
         m_oldParentWndProc = oldParentWndProc;


@@ -220,9 +230,33 @@ 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
         wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
 
         // map flags from Windows


@@ -231,6 +265,11 @@ LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
         bool replace = FALSE;
         if ( pFR->Flags & FR_DIALOGTERM )
         {
         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_CLOSE;
         }
         else if ( pFR->Flags & FR_FINDNEXT )


@@ -273,8 +312,20 @@ 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)::GetWindowLong(hwnd, GWL_USERDATA);
 


@@ -329,7 +380,7 @@ wxFindReplaceDialog::wxFindReplaceDialog(wxWindow *parent,
                                          wxFindReplaceData *data,
                                          const wxString &title,
                                          int flags)
                                          wxFindReplaceData *data,
                                          const wxString &title,
                                          int flags)

-                   : m_FindReplaceData(data)
+                   : wxFindReplaceDialogBase(parent, data, title, flags)

 {
     Init();
 
 {
     Init();
 


@@ -338,14 +389,26 @@ 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!
     m_isShown = FALSE;
 
     // unsubclass the parent
     delete m_impl;
 
     // prevent the base class dtor from trying to hide us!
     m_isShown = FALSE;
 

-    // and from destroying our window
-    m_hWnd = NULL;
+    // and from destroying our window [again]
+    m_hWnd = (WXHWND)NULL;

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


@@ -363,16 +426,6 @@ bool wxFindReplaceDialog::Create(wxWindow *parent,
     return parent != NULL;
 }
 
     return parent != NULL;
 }
 

-// ----------------------------------------------------------------------------
-// wxFindReplaceDialog data access
-// ----------------------------------------------------------------------------
-
-void wxFindReplaceDialog::SetData(wxFindReplaceData *data)
-{
-    delete m_FindReplaceData;
-    m_FindReplaceData = data;
-}
-

 // ----------------------------------------------------------------------------
 // wxFindReplaceData show/hide
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFindReplaceData show/hide
 // ----------------------------------------------------------------------------