X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2bcbdfbc798cccc134c192a4a0185035cd9303c..f2b7be7ad53d6147287ca97807774824167ddd0d:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index ef70b6f9e3..9899b14348 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -1141,7 +1141,7 @@ long wxTextCtrl::GetInsertionPoint() const return Pos & 0xFFFF; } -long wxTextCtrl::GetLastPosition() const +wxTextPos wxTextCtrl::GetLastPosition() const { int numLines = GetNumberOfLines(); long posStartLastLine = XYToPosition(0, numLines - 1); @@ -1836,7 +1836,6 @@ bool wxTextCtrl::SendUpdateEvent() wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); InitCommandEvent(event); - event.SetString(GetValue()); return ProcessCommand(event); } @@ -2083,7 +2082,7 @@ void wxTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event)) // Default colors for MSW text control // // Set default background color to the native white instead of -// the default wxSYS_COLOUR_BTNFACE (is triggered with wxNullColour). +// the default wxSYS_COLOUR_BTNFACE (is triggered with wxNullColour). // ---------------------------------------------------------------------------- wxVisualAttributes wxTextCtrl::GetDefaultAttributes() const @@ -2467,7 +2466,7 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style) { // we have to do this or the style wouldn't apply for the text typed by // the user - long posLast = GetLastPosition(); + wxTextPos posLast = GetLastPosition(); SetStyle(posLast, posLast, m_defaultStyle); } @@ -2532,7 +2531,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) wxStrcpy(lf.lfFaceName, cf.szFaceName); //NOTE: we _MUST_ set each of these values to _something_ since we - //do not call wxZeroMemory on the LOGFONT lf + //do not call wxZeroMemory on the LOGFONT lf if (cf.dwEffects & CFE_ITALIC) lf.lfItalic = TRUE; else