correct access for virtual

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

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


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "mswfdrepdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,24 +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/private.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
-

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

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

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


@@ -82,7 +73,7 @@ public:
     FINDREPLACE *GetPtrFindReplace() { return &m_findReplace; }
 
     // set/query the "closed by user" flag
     FINDREPLACE *GetPtrFindReplace() { return &m_findReplace; }
 
     // set/query the "closed by user" flag

-    void SetClosedByUser() { m_wasClosedByUser = TRUE; }
+    void SetClosedByUser() { m_wasClosedByUser = true; }

     bool WasClosedByUser() const { return m_wasClosedByUser; }
 
 private:
     bool WasClosedByUser() const { return m_wasClosedByUser; }
 
 private:


@@ -97,7 +88,7 @@ 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
+    // true if the user closed us, false otherwise

     bool m_wasClosedByUser;
 
     // registered Message for Dialog
     bool m_wasClosedByUser;
 
     // registered Message for Dialog


@@ -133,7 +124,7 @@ wxFindReplaceDialogImpl::wxFindReplaceDialogImpl(wxFindReplaceDialog *dialog,
     m_hwndOwner = NULL;
     m_oldParentWndProc = NULL;
 
     m_hwndOwner = NULL;
     m_oldParentWndProc = NULL;
 

-    m_wasClosedByUser = FALSE;
+    m_wasClosedByUser = false;

 
     wxZeroMemory(m_findReplace);
 
 
     wxZeroMemory(m_findReplace);
 


@@ -178,7 +169,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)


@@ -199,14 +190,14 @@ 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

-    if ( !wxCheckWindowWndProc((WXHWND)hwnd, (WXFARPROC)wxFindReplaceWindowProc) )
-    {
-        // set the new one and save the old as user data to allow access to it
-        // from wxFindReplaceWindowProc
-        m_oldParentWndProc = wxSetWindowProc(hwnd, wxFindReplaceWindowProc);
+    wxCHECK_RET( wxGetWindowProc(hwnd) != &wxFindReplaceWindowProc,
+                 _T("can't have more than one find dialog currently") );

 
 

-        wxSetWindowUserData(hwnd, (void *)m_oldParentWndProc);
-    }
+    // 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()
 }
 
 wxFindReplaceDialogImpl::~wxFindReplaceDialogImpl()


@@ -225,7 +216,7 @@ wxFindReplaceDialogImpl::~wxFindReplaceDialogImpl()
 // Window Proc for handling RegisterWindowMessage(FINDMSGSTRING)
 // ----------------------------------------------------------------------------
 
 // Window Proc for handling RegisterWindowMessage(FINDMSGSTRING)
 // ----------------------------------------------------------------------------
 

-LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
+LRESULT CALLBACK wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,

                                          WPARAM wParam, LPARAM lParam)
 {
 #if wxUSE_UNICODE_MSLU
                                          WPARAM wParam, LPARAM lParam)
 {
 #if wxUSE_UNICODE_MSLU


@@ -247,7 +238,7 @@ LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
         // 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
         // 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 )
+        if ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags )

         {
             s_lastMsgFlags = 0;
             return 0;
         {
             s_lastMsgFlags = 0;
             return 0;


@@ -260,7 +251,7 @@ LRESULT APIENTRY wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
         // map flags from Windows
         wxEventType evtType;
 
         // map flags from Windows
         wxEventType evtType;
 

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

         if ( pFR->Flags & FR_DIALOGTERM )
         {
             // we have to notify the dialog that it's being closed by user and
         if ( pFR->Flags & FR_DIALOGTERM )
         {
             // we have to notify the dialog that it's being closed by user and


@@ -278,13 +269,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
         {


@@ -372,7 +363,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,


@@ -404,7 +395,7 @@ wxFindReplaceDialog::~wxFindReplaceDialog()
     delete m_impl;
 
     // prevent the base class dtor from trying to hide us!
     delete m_impl;
 
     // prevent the base class dtor from trying to hide us!

-    m_isShown = FALSE;
+    m_isShown = false;

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


@@ -434,7 +425,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?


@@ -443,16 +434,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?") );
 


@@ -482,7 +473,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


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

-    return TRUE;
+    return true;

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


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

-