return begining of the selection for GetInsertionPoint to match what

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

diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 871a4c7b0a48550c33bbd00d06d301c9d7deef56..7eab0dae8d707ea8faeba638a0fe7476de259c7d 100644 (file)
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -35,12 +35,7 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

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

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


@@ -82,7 +77,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 +92,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 +128,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 +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)


@@ -205,7 +200,7 @@ void wxFindReplaceDialogImpl::SubclassDialog(HWND hwnd)
         // from wxFindReplaceWindowProc
         m_oldParentWndProc = wxSetWindowProc(hwnd, wxFindReplaceWindowProc);
 
         // from wxFindReplaceWindowProc
         m_oldParentWndProc = wxSetWindowProc(hwnd, wxFindReplaceWindowProc);
 

-        wxSetWindowUserData(hwnd, m_oldParentWndProc);
+        wxSetWindowUserData(hwnd, (void *)m_oldParentWndProc);

     }
 }
 
     }
 }
 


@@ -260,7 +255,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 +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
         {


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


@@ -404,7 +399,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 +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?


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


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


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

-    return TRUE;
+    return true;

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