X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a47d3c193a8358f9be6a9249af28b6cb10eacff..7d4194184e83bbccf1a88325cca59d8d0d2faef1:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index bfb35eaa50..65b1f25222 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -68,13 +68,26 @@ #endif #if !USE_SHARED_LIBRARY + IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_CHAR(wxTextCtrl::OnChar) EVT_DROP_FILES(wxTextCtrl::OnDropFiles) - EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground) + + EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) + EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy) + EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste) + EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo) + EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo) + + EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut) + EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy) + EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste) + EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) + EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() + #endif // USE_SHARED_LIBRARY // Text item @@ -122,7 +135,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, if (m_windowStyle & wxTE_MULTILINE) { wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER), - "wxTE_PROCESS_ENTER style is ignored for multiline controls" ); + _T("wxTE_PROCESS_ENTER style is ignored for multiline controls") ); msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL ; // WS_BORDER m_windowStyle |= wxTE_PROCESS_ENTER; @@ -138,14 +151,14 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, if (m_windowStyle & wxTE_PASSWORD) // hidden input msStyle |= ES_PASSWORD; - const char *windowClass = "EDIT"; + const wxChar *windowClass = _T("EDIT"); #if wxUSE_RICHEDIT if ( m_windowStyle & wxTE_MULTILINE ) { msStyle |= ES_AUTOVSCROLL; m_isRich = TRUE; - windowClass = "RichEdit" ; + windowClass = _T("RichEdit") ; } else m_isRich = FALSE; @@ -159,7 +172,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, #if wxUSE_RICHEDIT if (m_windowStyle & wxSIMPLE_BORDER) { - windowClass = "EDIT"; + windowClass = _T("EDIT"); m_isRich = FALSE; } #endif @@ -174,7 +187,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, 0, 0, 0, 0, (HWND) ((wxWindow*)parent)->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); - wxCHECK_MSG( m_hWnd, FALSE, "Failed to create text ctrl" ); + wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create text ctrl") ); #if wxUSE_CTL3D if ( want3D ) @@ -222,12 +235,12 @@ void wxTextCtrl::AdoptAttributesFromHWND() { wxWindow::AdoptAttributesFromHWND(); - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); long style = GetWindowLong((HWND) hWnd, GWL_STYLE); // retrieve the style to see whether this is an edit or richedit ctrl #if wxUSE_RICHEDIT - char buf[256]; + wxChar buf[256]; #ifndef __WIN32__ GetClassName((HWND) hWnd, buf, 256); @@ -246,7 +259,7 @@ void wxTextCtrl::AdoptAttributesFromHWND() wxString str(buf); str.UpperCase(); - if (str == "EDIT") + if (str == _T("EDIT")) m_isRich = FALSE; else m_isRich = TRUE; @@ -270,12 +283,7 @@ void wxTextCtrl::SetupColours() wxString wxTextCtrl::GetValue() const { - int length = GetWindowTextLength((HWND) GetHWND()); - char *s = new char[length+1]; - GetWindowText((HWND) GetHWND(), s, length+1); - wxString str(s); - delete[] s; - return str; + return wxGetWindowText(GetHWND()); } void wxTextCtrl::SetValue(const wxString& value) @@ -291,7 +299,7 @@ void wxTextCtrl::SetValue(const wxString& value) } if (singletons > 0) { - char *tmp = new char[len + singletons + 1]; + wxChar *tmp = new wxChar[len + singletons + 1]; int j = 0; for (i = 0; i < len; i ++) { @@ -304,11 +312,13 @@ void wxTextCtrl::SetValue(const wxString& value) j ++; } tmp[j] = 0; - SetWindowText((HWND) GetHWND(), tmp); + SetWindowText(GetHwnd(), tmp); delete[] tmp; } else - SetWindowText((HWND) GetHWND(), (const char *)value); + SetWindowText(GetHwnd(), (const wxChar *)value); + + AdjustSpaceLimit(); } void wxTextCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags) @@ -356,38 +366,47 @@ void wxTextCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags) if (control_width <= 0) control_width = DEFAULT_ITEM_WIDTH; - MoveWindow((HWND) GetHWND(), (int)control_x, (int)control_y, + MoveWindow(GetHwnd(), (int)control_x, (int)control_y, (int)control_width, (int)control_height, TRUE); } // Clipboard operations void wxTextCtrl::Copy() { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_COPY, 0, 0L); + if (CanCopy()) + { + HWND hWnd = GetHwnd(); + SendMessage(hWnd, WM_COPY, 0, 0L); + } } void wxTextCtrl::Cut() { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_CUT, 0, 0L); + if (CanCut()) + { + HWND hWnd = GetHwnd(); + SendMessage(hWnd, WM_CUT, 0, 0L); + } } void wxTextCtrl::Paste() { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_PASTE, 0, 0L); + if (CanPaste()) + { + HWND hWnd = GetHwnd(); + SendMessage(hWnd, WM_PASTE, 0, 0L); + } } void wxTextCtrl::SetEditable(bool editable) { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L); } void wxTextCtrl::SetInsertionPoint(long pos) { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); #ifdef __WIN32__ #if wxUSE_RICHEDIT if ( m_isRich) @@ -425,25 +444,25 @@ long wxTextCtrl::GetInsertionPoint() const CHARRANGE range; range.cpMin = 0; range.cpMax = 0; - SendMessage((HWND) GetHWND(), EM_EXGETSEL, 0, (LPARAM) &range); + SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) &range); return range.cpMin; } #endif - DWORD Pos=(DWORD)SendMessage((HWND) GetHWND(), EM_GETSEL, 0, 0L); + DWORD Pos=(DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L); return Pos&0xFFFF; } long wxTextCtrl::GetLastPosition() const { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); // Will always return a number > 0 (according to docs) int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L); // This gets the char index for the _beginning_ of the last line int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L); - + // Get number of characters in the last line. We'll add this to the character // index for the last line, 1st position. int lineLength = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0L); @@ -454,10 +473,10 @@ long wxTextCtrl::GetLastPosition() const void wxTextCtrl::Replace(long from, long to, const wxString& value) { #if wxUSE_CLIPBOARD - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); long fromChar = from; long toChar = to; - + // Set selection and remove it #ifdef __WIN32__ SendMessage(hWnd, EM_SETSEL, fromChar, toChar); @@ -467,7 +486,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value) SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0); // Now replace with 'value', by pasting. - wxSetClipboardData(wxDF_TEXT, (wxObject *) (const char *)value, 0, 0); + wxSetClipboardData(wxDF_TEXT, (wxObject *) (const wxChar *)value, 0, 0); // Paste into edit control SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L); @@ -478,10 +497,10 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value) void wxTextCtrl::Remove(long from, long to) { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); long fromChar = from; long toChar = to; - + // Cut all selected text #ifdef __WIN32__ SendMessage(hWnd, EM_SETSEL, fromChar, toChar); @@ -493,7 +512,7 @@ void wxTextCtrl::Remove(long from, long to) void wxTextCtrl::SetSelection(long from, long to) { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); long fromChar = from; long toChar = to; // if from and to are both -1, it means @@ -504,7 +523,7 @@ void wxTextCtrl::SetSelection(long from, long to) fromChar = 0; toChar = -1; } - + #ifdef __WIN32__ SendMessage(hWnd, EM_SETSEL, (WPARAM)fromChar, (LPARAM)toChar); SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0); @@ -524,7 +543,7 @@ bool wxTextCtrl::LoadFile(const wxString& file) Clear(); // ifstream input(WXSTRINGCAST file, ios::nocreate | ios::in); - ifstream input(WXSTRINGCAST file, ios::in); + ifstream input(MBSTRINGCAST file.mb_str(wxConvFile), ios::in); if (!input.bad()) { @@ -536,37 +555,45 @@ bool wxTextCtrl::LoadFile(const wxString& file) #ifdef __SALFORDC__ struct _stat stat_buf; - if (stat((char*) (const char*) file, &stat_buf) < 0) + if (stat(MBSTRINGCAST file.mb_str(wxConvFile), &stat_buf) < 0) return FALSE; #else struct stat stat_buf; - if (stat(file, &stat_buf) < 0) + if (stat(file.mb_str(wxConvFile), &stat_buf) < 0) return FALSE; #endif -// char *tmp_buffer = (char*)farmalloc(stat_buf.st_size+1); +// wxChar *tmp_buffer = (wxChar*)farmalloc(stat_buf.st_size+1); // This may need to be a bigger buffer than the file size suggests, // if it's a UNIX file. Give it an extra 1000 just in case. - char *tmp_buffer = (char*)farmalloc((size_t)(stat_buf.st_size+1+1000)); + wxChar *tmp_buffer = (wxChar*)farmalloc((size_t)(stat_buf.st_size+1+1000)); + char *read_buffer = new char[512]; long no_lines = 0; long pos = 0; while (!input.eof() && input.peek() != EOF) { - input.getline(wxBuffer, 500); - int len = strlen(wxBuffer); + input.getline(read_buffer, 500); + int len = strlen(read_buffer); wxBuffer[len] = 13; wxBuffer[len+1] = 10; wxBuffer[len+2] = 0; - strcpy(tmp_buffer+pos, wxBuffer); - pos += strlen(wxBuffer); +#if wxUSE_UNICODE + pos += wxConvCurrent->MB2WC(tmp_buffer+pos, read_buffer, (size_t)-1); +#else + strcpy(tmp_buffer+pos, read_buffer); + pos += strlen(read_buffer); +#endif no_lines++; } + delete[] read_buffer; -// SendMessage((HWND) GetHWND(), WM_SETTEXT, 0, (LPARAM)tmp_buffer); - SetWindowText((HWND) GetHWND(), tmp_buffer); - SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L); + SetWindowText(GetHwnd(), tmp_buffer); + SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L); farfree(tmp_buffer); + // update the size limit if needed + AdjustSpaceLimit(); + return TRUE; } return FALSE; @@ -578,22 +605,22 @@ bool wxTextCtrl::SaveFile(const wxString& file) { wxString theFile(file); - if (theFile == "") + if (theFile == _T("")) theFile = m_fileName; - if (theFile == "") + if (theFile == _T("")) return FALSE; m_fileName = theFile; - ofstream output((char*) (const char*) theFile); + ofstream output(MBSTRINGCAST theFile.mb_str(wxConvFile)); if (output.bad()) return FALSE; // This will only save 64K max - unsigned long nbytes = SendMessage((HWND) GetHWND(), WM_GETTEXTLENGTH, 0, 0); + unsigned long nbytes = SendMessage(GetHwnd(), WM_GETTEXTLENGTH, 0, 0); char *tmp_buffer = (char*)farmalloc((size_t)(nbytes+1)); - SendMessage((HWND) GetHWND(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)tmp_buffer); + SendMessage(GetHwnd(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)tmp_buffer); char *pstr = tmp_buffer; // Convert \r\n to just \n @@ -605,7 +632,7 @@ bool wxTextCtrl::SaveFile(const wxString& file) } farfree(tmp_buffer); - SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L); + SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L); return TRUE; } @@ -629,8 +656,10 @@ void wxTextCtrl::WriteText(const wxString& text) j ++; } newtext[j] = 0; - SendMessage((HWND) GetHWND(), EM_REPLACESEL, 0, (LPARAM)newtext); + SendMessage(GetHwnd(), EM_REPLACESEL, 0, (LPARAM)newtext); delete[] newtext; + + AdjustSpaceLimit(); } void wxTextCtrl::AppendText(const wxString& text) @@ -641,33 +670,33 @@ void wxTextCtrl::AppendText(const wxString& text) void wxTextCtrl::Clear() { - SetWindowText((HWND) GetHWND(), ""); + SetWindowText(GetHwnd(), _T("")); } bool wxTextCtrl::IsModified() const { - return (SendMessage((HWND) GetHWND(), EM_GETMODIFY, 0, 0) != 0); + return (SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0); } // Makes 'unmodified' void wxTextCtrl::DiscardEdits() { - SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L); + SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L); } /* * Some of the following functions are yet to be implemented * */ - + int wxTextCtrl::GetNumberOfLines() const { - return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0); + return (int)SendMessage(GetHwnd(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0); } long wxTextCtrl::XYToPosition(long x, long y) const { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); // This gets the char index for the _beginning_ of this line int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)y, (LPARAM)0); @@ -676,7 +705,7 @@ long wxTextCtrl::XYToPosition(long x, long y) const void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); // This gets the line number containing the character int lineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0); @@ -689,7 +718,7 @@ void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const void wxTextCtrl::ShowPosition(long pos) { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); // To scroll to a position, we pass the number of lines and characters // to scroll *by*. This means that we need to: @@ -705,34 +734,129 @@ void wxTextCtrl::ShowPosition(long pos) int currentLineLineNo = (int)SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, (WPARAM)0, (LPARAM)0L); int specifiedLineLineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0L); - + int linesToScroll = specifiedLineLineNo - currentLineLineNo; if (linesToScroll != 0) - (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)MAKELPARAM(linesToScroll, 0)); + (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)linesToScroll); } int wxTextCtrl::GetLineLength(long lineNo) const { long charIndex = XYToPosition(0, lineNo); - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); int len = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0); return len; } wxString wxTextCtrl::GetLineText(long lineNo) const { - HWND hWnd = (HWND) GetHWND(); + HWND hWnd = GetHwnd(); *(WORD *)wxBuffer = 512; int noChars = (int)SendMessage(hWnd, EM_GETLINE, (WPARAM)lineNo, (LPARAM)wxBuffer); wxBuffer[noChars] = 0; return wxString(wxBuffer); } -/* - * Text item - */ - +bool wxTextCtrl::CanCopy() const +{ + // Can copy if there's a selection + long from, to; + GetSelection(& from, & to); + return (from != to) ; +} + +bool wxTextCtrl::CanCut() const +{ + // Can cut if there's a selection + long from, to; + GetSelection(& from, & to); + return (from != to) ; +} + +bool wxTextCtrl::CanPaste() const +{ +#if wxUSE_RICHEDIT + if (m_isRich) + { + int dataFormat = 0; // 0 == any format + return (::SendMessage( GetHwnd(), EM_CANPASTE, (WPARAM) (UINT) dataFormat, 0) != 0); + } +#endif + if (!IsEditable()) + return FALSE; + + // Standard edit control: check for straight text on clipboard + bool isTextAvailable = FALSE; + if (::OpenClipboard((HWND) wxTheApp->GetTopWindow()->GetHWND())) + { + isTextAvailable = (::IsClipboardFormatAvailable(CF_TEXT) != 0); + ::CloseClipboard(); + } + return isTextAvailable; +} + +// Undo/redo +void wxTextCtrl::Undo() +{ + if (CanUndo()) + { + ::SendMessage(GetHwnd(), EM_UNDO, 0, 0); + } +} + +void wxTextCtrl::Redo() +{ + if (CanRedo()) + { + // Same as Undo, since Undo undoes the undo, i.e. a redo. + ::SendMessage(GetHwnd(), EM_UNDO, 0, 0); + } +} + +bool wxTextCtrl::CanUndo() const +{ + return (::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0); +} + +bool wxTextCtrl::CanRedo() const +{ + return (::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0); +} + +// If the return values from and to are the same, there is no +// selection. +void wxTextCtrl::GetSelection(long* from, long* to) const +{ +#if wxUSE_RICHEDIT + if (m_isRich) + { + CHARRANGE charRange; + ::SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) (CHARRANGE*) & charRange); + + *from = charRange.cpMin; + *to = charRange.cpMax; + + return; + } +#endif + DWORD dwStart, dwEnd; + WPARAM wParam = (WPARAM) (DWORD*) & dwStart; // receives starting position + LPARAM lParam = (LPARAM) (DWORD*) & dwEnd; // receives ending position + + ::SendMessage(GetHwnd(), EM_GETSEL, wParam, lParam); + + *from = dwStart; + *to = dwEnd; +} + +bool wxTextCtrl::IsEditable() const +{ + long style = ::GetWindowLong(GetHwnd(), GWL_STYLE); + + return ((style & ES_READONLY) == 0); +} + void wxTextCtrl::Command(wxCommandEvent & event) { SetValue (event.GetString()); @@ -752,7 +876,7 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) // AT&T's "C++ Lanuage System Release 3.0 Library Manual" - Stein Somers //========================================================================= -// Called then the buffer is full (gcc 2.6.3) +// Called then the buffer is full (gcc 2.6.3) // or when "endl" is output (Borland 4.5) //========================================================================= // Class declaration using multiple inheritance doesn't work properly for @@ -770,7 +894,7 @@ int wxTextCtrl::overflow(int c) return EOF; } #endif - + // Verify that there are no characters in get area if ( gptr() && gptr() < egptr() ) { @@ -884,7 +1008,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) wxTextCtrl& wxTextCtrl::operator<<(float f) { wxString str; - str.Printf("%.2f", f); + str.Printf(_T("%.2f"), f); AppendText(str); return *this; } @@ -892,7 +1016,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f) wxTextCtrl& wxTextCtrl::operator<<(double d) { wxString str; - str.Printf("%.2f", d); + str.Printf(_T("%.2f"), d); AppendText(str); return *this; } @@ -900,7 +1024,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d) wxTextCtrl& wxTextCtrl::operator<<(int i) { wxString str; - str.Printf("%d", i); + str.Printf(_T("%d"), i); AppendText(str); return *this; } @@ -908,7 +1032,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i) wxTextCtrl& wxTextCtrl::operator<<(long i) { wxString str; - str.Printf("%ld", i); + str.Printf(_T("%ld"), i); AppendText(str); return *this; } @@ -953,30 +1077,10 @@ WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, void wxTextCtrl::OnChar(wxKeyEvent& event) { - switch( event.KeyCode() ) + switch ( event.KeyCode() ) { - // Fix by Marcel Rasche to allow Alt-Ctrl insertion of special characters - case '{': - case '}': - case '[': - case ']': - case '|': - case '~': - case '\\': - { - char c = (char)event.KeyCode(); - WriteText(c); - } - break; - case WXK_RETURN: - { -/* Oh yes it will, because we also specify DLGC_WANTCHARS - wxASSERT_MSG( m_windowStyle & wxTE_PROCESS_ENTER, - "this text ctrl should never receive return" ); -*/ - - if ( (m_windowStyle & wxTE_MULTILINE) == 0 ) + if ( !(m_windowStyle & wxTE_MULTILINE) ) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject( this ); @@ -986,7 +1090,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) //else: multiline controls need Enter for themselves break; - } + case WXK_TAB: // only produce navigation event if we don't process TAB ourself or // if it's a Shift-Tab keypress (we assume nobody will ever need @@ -1000,18 +1104,23 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) eventNav.SetDirection(!event.ShiftDown()); eventNav.SetWindowChange(FALSE); eventNav.SetEventObject(this); - + if ( GetEventHandler()->ProcessEvent(eventNav) ) return; } break; + + default: + event.Skip(); + return; } - + // don't just call event.Skip() because this will cause TABs and ENTERs // be passed upwards and we don't always want this - instead process it // right here - Default(); -// event.Skip(); + + // FIXME + event.Skip(); } long wxTextCtrl::MSWGetDlgCode() @@ -1030,110 +1139,79 @@ long wxTextCtrl::MSWGetDlgCode() lRc |= DLGC_WANTMESSAGE; if ( m_windowStyle & wxTE_PROCESS_TAB ) lRc |= DLGC_WANTTAB; - + return lRc; } -void wxTextCtrl::OnEraseBackground(wxEraseEvent& event) +bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { - if ( m_windowStyle & wxTE_MULTILINE ) + switch (param) { - // No flicker - only problem is we probably can't change the background - Default(); -/* - RECT rect; - ::GetClientRect((HWND) GetHWND(), &rect); + case EN_SETFOCUS: + case EN_KILLFOCUS: + { + wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS + : wxEVT_SET_FOCUS, + m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + } + break; + + case EN_CHANGE: + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + wxString val(GetValue()); + if ( !val.IsNull() ) + event.m_commandString = WXSTRINGCAST val; + event.SetEventObject( this ); + ProcessCommand(event); + } + break; - HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue())); - int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT); + case EN_ERRSPACE: + // the text size limit has been hit - increase it + AdjustSpaceLimit(); + break; - ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush); - ::DeleteObject(hBrush); - ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode); -*/ + // the other notification messages are not processed + case EN_UPDATE: + case EN_MAXTEXT: + case EN_HSCROLL: + case EN_VSCROLL: + default: + return FALSE; } -// wxWindow::OnEraseBackground(event); + + // processed + return TRUE; } -bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) +void wxTextCtrl::AdjustSpaceLimit() { -/* - // Debugging - wxDebugMsg("Edit control %d: ", (int)id); - switch (param) - { - case EN_SETFOCUS: - wxDebugMsg("EN_SETFOCUS\n"); - break; - case EN_KILLFOCUS: - wxDebugMsg("EN_KILLFOCUS\n"); - break; - case EN_CHANGE: - wxDebugMsg("EN_CHANGE\n"); - break; - case EN_UPDATE: - wxDebugMsg("EN_UPDATE\n"); - break; - case EN_ERRSPACE: - wxDebugMsg("EN_ERRSPACE\n"); - break; - case EN_MAXTEXT: - wxDebugMsg("EN_MAXTEXT\n"); - break; - case EN_HSCROLL: - wxDebugMsg("EN_HSCROLL\n"); - break; - case EN_VSCROLL: - wxDebugMsg("EN_VSCROLL\n"); - break; - default: - wxDebugMsg("Unknown EDIT notification\n"); - break; - } -*/ - switch (param) - { - case EN_SETFOCUS: - case EN_KILLFOCUS: - { - wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS - : wxEVT_SET_FOCUS, - m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); - } - break; - - case EN_CHANGE: - { - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); - wxString val(GetValue()); - if ( !val.IsNull() ) - event.m_commandString = WXSTRINGCAST val; - event.SetEventObject( this ); - ProcessCommand(event); - } - break; - - // the other notification messages are not processed - case EN_UPDATE: - case EN_ERRSPACE: - case EN_MAXTEXT: - case EN_HSCROLL: - case EN_VSCROLL: - default: - return FALSE; - } +#ifndef __WIN16__ + unsigned int len = ::GetWindowTextLength(GetHwnd()), + limit = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0); + if ( len > limit ) + { + limit = len + 0x8000; // 32Kb - // processed - return TRUE; +#if wxUSE_RICHEDIT + if ( m_isRich || limit > 0xffff ) +#else + if ( limit > 0xffff ) +#endif + ::SendMessage(GetHwnd(), EM_LIMITTEXT, 0, limit); + else + ::SendMessage(GetHwnd(), EM_LIMITTEXT, limit, 0); + } +#endif } - // For Rich Edit controls. Do we need it? #if 0 #if wxUSE_RICHEDIT -bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) +bool wxTextCtrl::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam) { wxCommandEvent event(0, m_windowId); int eventType = 0; @@ -1142,7 +1220,7 @@ bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) { // Insert case code here default : - return wxControl::MSWNotify(wParam, lParam); + return wxControl::MSWOnNotify(wParam, lParam); break; } @@ -1157,3 +1235,53 @@ bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) #endif #endif +void wxTextCtrl::OnCut(wxCommandEvent& event) +{ + Cut(); +} + +void wxTextCtrl::OnCopy(wxCommandEvent& event) +{ + Copy(); +} + +void wxTextCtrl::OnPaste(wxCommandEvent& event) +{ + Paste(); +} + +void wxTextCtrl::OnUndo(wxCommandEvent& event) +{ + Undo(); +} + +void wxTextCtrl::OnRedo(wxCommandEvent& event) +{ + Redo(); +} + +void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event) +{ + event.Enable( CanCut() ); +} + +void wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent& event) +{ + event.Enable( CanCopy() ); +} + +void wxTextCtrl::OnUpdatePaste(wxUpdateUIEvent& event) +{ + event.Enable( CanPaste() ); +} + +void wxTextCtrl::OnUpdateUndo(wxUpdateUIEvent& event) +{ + event.Enable( CanUndo() ); +} + +void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) +{ + event.Enable( CanRedo() ); +} +