X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cf98a658a11f0ea3fb723ea686a77b8adb39718..891ad68ff5ac338d81ea0c4ff176601761e73517:/src/msw/textctrl.cpp?ds=sidebyside diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index dc70319e75..8a4f405bd4 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -23,6 +23,9 @@ #ifndef WX_PRECOMP #include "wx/textctrl.h" #include "wx/settings.h" +#include "wx/brush.h" +#include "wx/utils.h" +#include "wx/log.h" #endif #if wxUSE_CLIPBOARD @@ -36,20 +39,21 @@ #include #if wxUSE_IOSTREAMH -#include +# include #else -#include -# ifdef _MSC_VER - using namespace std; -# endif +# include #endif #include +#ifndef __MWERKS__ #include +#else +#include +#endif #if defined(__BORLANDC__) && !defined(__WIN32__) #include #else -#ifndef __GNUWIN32__ +#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) #include #endif #define farmalloc malloc @@ -59,29 +63,43 @@ #include -#if defined(__WIN95__) && !defined(__GNUWIN32__) -#include +#if wxUSE_RICHEDIT && !defined(__GNUWIN32__) + #include #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 +#endif // USE_SHARED_LIBRARY // Text item -wxTextCtrl::wxTextCtrl(void) +wxTextCtrl::wxTextCtrl() #ifndef NO_TEXT_WINDOW_STREAM - :streambuf() + : streambuf() #endif { - m_fileName = ""; +#if wxUSE_RICHEDIT m_isRich = FALSE; +#endif } bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, @@ -91,7 +109,6 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - m_fileName = ""; SetName(name); SetValidator(validator); if (parent) parent->AddChild(this); @@ -115,24 +132,15 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, int width = size.x; int height = size.y; -#ifdef __WIN32__ - WXHGLOBAL m_globalHandle = 0; -#else - // Obscure method from the MS Developer's Network Disk for - // using global memory instead of the local heap, which - // runs out far too soon. Solves the problem with - // failing to appear. - - // Doesn't seem to work for Win95, so removing. - m_globalHandle=0; -// if ((wxGetOsVersion() != wxWINDOWS_NT) && (wxGetOsVersion() != wxWIN95)) -// m_globalHandle = (WXHGLOBAL) GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, -// 256L); -#endif - long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP; if (m_windowStyle & wxTE_MULTILINE) - msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL ; // WS_BORDER + { + wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER), + "wxTE_PROCESS_ENTER style is ignored for multiline controls" ); + + msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL ; // WS_BORDER + m_windowStyle |= wxTE_PROCESS_ENTER; + } else msStyle |= ES_AUTOHSCROLL ; @@ -144,8 +152,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, if (m_windowStyle & wxTE_PASSWORD) // hidden input msStyle |= ES_PASSWORD; - char *windowClass = "EDIT"; -#if defined(__WIN95__) + const char *windowClass = "EDIT"; + +#if wxUSE_RICHEDIT if ( m_windowStyle & wxTE_MULTILINE ) { msStyle |= ES_AUTOVSCROLL; @@ -153,19 +162,19 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, windowClass = "RichEdit" ; } else -#endif m_isRich = FALSE; +#endif bool want3D; WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; // If we're in Win95, and we want a simple 2D border, // then make it an EDIT control instead. -#if defined(__WIN95__) +#if wxUSE_RICHEDIT if (m_windowStyle & wxSIMPLE_BORDER) { windowClass = "EDIT"; - m_isRich = FALSE; + m_isRich = FALSE; } #endif @@ -177,11 +186,11 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, m_hWnd = (WXHWND)::CreateWindowEx(exStyle, windowClass, NULL, msStyle, 0, 0, 0, 0, (HWND) ((wxWindow*)parent)->GetHWND(), (HMENU)m_windowId, - m_globalHandle ? (HINSTANCE) m_globalHandle : wxGetInstance(), NULL); + wxGetInstance(), NULL); wxCHECK_MSG( m_hWnd, FALSE, "Failed to create text ctrl" ); -#if CTL3D +#if wxUSE_CTL3D if ( want3D ) { Ctl3dSubclassCtl((HWND)m_hWnd); @@ -189,7 +198,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, } #endif -#if defined(__WIN95__) +#if wxUSE_RICHEDIT if (m_isRich) { // Have to enable events @@ -200,9 +209,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, SubclassWin(GetHWND()); - if ( parent->GetFont() && parent->GetFont()->Ok() ) + if ( parent->GetFont().Ok() && parent->GetFont().Ok() ) { - SetFont(* parent->GetFont()); + SetFont(parent->GetFont()); } else { @@ -223,23 +232,29 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, } // Make sure the window style (etc.) reflects the HWND style (roughly) -void wxTextCtrl::AdoptAttributesFromHWND(void) +void wxTextCtrl::AdoptAttributesFromHWND() { wxWindow::AdoptAttributesFromHWND(); HWND hWnd = (HWND) GetHWND(); long style = GetWindowLong((HWND) hWnd, GWL_STYLE); - char buf[256]; + // retrieve the style to see whether this is an edit or richedit ctrl +#if wxUSE_RICHEDIT + char buf[256]; #ifndef __WIN32__ GetClassName((HWND) hWnd, buf, 256); #else #ifdef UNICODE GetClassNameW((HWND) hWnd, buf, 256); +#else +#ifdef __TWIN32__ + GetClassName((HWND) hWnd, buf, 256); #else GetClassNameA((HWND) hWnd, buf, 256); #endif +#endif #endif wxString str(buf); @@ -249,6 +264,7 @@ void wxTextCtrl::AdoptAttributesFromHWND(void) m_isRich = FALSE; else m_isRich = TRUE; +#endif if (style & ES_MULTILINE) m_windowStyle |= wxTE_MULTILINE; @@ -260,13 +276,13 @@ void wxTextCtrl::AdoptAttributesFromHWND(void) m_windowStyle |= wxTE_PROCESS_ENTER; } -void wxTextCtrl::SetupColours(void) +void wxTextCtrl::SetupColours() { SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); SetForegroundColour(GetParent()->GetForegroundColour()); } -wxString wxTextCtrl::GetValue(void) const +wxString wxTextCtrl::GetValue() const { int length = GetWindowTextLength((HWND) GetHWND()); char *s = new char[length+1]; @@ -309,7 +325,7 @@ void wxTextCtrl::SetValue(const wxString& value) SetWindowText((HWND) GetHWND(), (const char *)value); } -void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxTextCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -328,7 +344,7 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags) int cx; // button font dimensions int cy; - wxGetCharSize(GetHWND(), &cx, &cy,GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); int control_width, control_height, control_x, control_y; @@ -359,22 +375,31 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags) } // Clipboard operations -void wxTextCtrl::Copy(void) +void wxTextCtrl::Copy() { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_COPY, 0, 0L); + if (CanCopy()) + { + HWND hWnd = (HWND) GetHWND(); + SendMessage(hWnd, WM_COPY, 0, 0L); + } } -void wxTextCtrl::Cut(void) +void wxTextCtrl::Cut() { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_CUT, 0, 0L); + if (CanCut()) + { + HWND hWnd = (HWND) GetHWND(); + SendMessage(hWnd, WM_CUT, 0, 0L); + } } -void wxTextCtrl::Paste(void) +void wxTextCtrl::Paste() { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_PASTE, 0, 0L); + if (CanPaste()) + { + HWND hWnd = (HWND) GetHWND(); + SendMessage(hWnd, WM_PASTE, 0, 0L); + } } void wxTextCtrl::SetEditable(bool editable) @@ -387,7 +412,7 @@ void wxTextCtrl::SetInsertionPoint(long pos) { HWND hWnd = (HWND) GetHWND(); #ifdef __WIN32__ -#if defined(__WIN95__) +#if wxUSE_RICHEDIT if ( m_isRich) { CHARRANGE range; @@ -409,15 +434,15 @@ void wxTextCtrl::SetInsertionPoint(long pos) SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing); } -void wxTextCtrl::SetInsertionPointEnd(void) +void wxTextCtrl::SetInsertionPointEnd() { long pos = GetLastPosition(); SetInsertionPoint(pos); } -long wxTextCtrl::GetInsertionPoint(void) const +long wxTextCtrl::GetInsertionPoint() const { -#if defined(__WIN95__) +#if wxUSE_RICHEDIT if (m_isRich) { CHARRANGE range; @@ -432,7 +457,7 @@ long wxTextCtrl::GetInsertionPoint(void) const return Pos&0xFFFF; } -long wxTextCtrl::GetLastPosition(void) const +long wxTextCtrl::GetLastPosition() const { HWND hWnd = (HWND) GetHWND(); @@ -441,7 +466,7 @@ long wxTextCtrl::GetLastPosition(void) const // 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); @@ -451,10 +476,11 @@ long wxTextCtrl::GetLastPosition(void) const void wxTextCtrl::Replace(long from, long to, const wxString& value) { +#if wxUSE_CLIPBOARD HWND hWnd = (HWND) GetHWND(); long fromChar = from; long toChar = to; - + // Set selection and remove it #ifdef __WIN32__ SendMessage(hWnd, EM_SETSEL, fromChar, toChar); @@ -468,6 +494,9 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value) // Paste into edit control SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L); +#else + wxFAIL_MSG("wxTextCtrl::Replace not implemented if wxUSE_CLIPBOARD is 0."); +#endif } void wxTextCtrl::Remove(long from, long to) @@ -475,7 +504,7 @@ void wxTextCtrl::Remove(long from, long to) HWND hWnd = (HWND) GetHWND(); long fromChar = from; long toChar = to; - + // Cut all selected text #ifdef __WIN32__ SendMessage(hWnd, EM_SETSEL, fromChar, toChar); @@ -498,7 +527,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); @@ -510,7 +539,7 @@ void wxTextCtrl::SetSelection(long from, long to) bool wxTextCtrl::LoadFile(const wxString& file) { - if (!FileExists(WXSTRINGCAST file)) + if (!wxFileExists(WXSTRINGCAST file)) return FALSE; m_fileName = file; @@ -528,9 +557,16 @@ bool wxTextCtrl::LoadFile(const wxString& file) // positions as signed shorts. Now load in one chunk... // Note use of 'farmalloc' as in Borland 3.1 'size_t' is 16-bits... +#ifdef __SALFORDC__ + struct _stat stat_buf; + if (stat((char*) (const char*) file, &stat_buf) < 0) + return FALSE; +#else struct stat stat_buf; if (stat(file, &stat_buf) < 0) return FALSE; +#endif + // char *tmp_buffer = (char*)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. @@ -563,16 +599,19 @@ bool wxTextCtrl::LoadFile(const wxString& file) // Returns TRUE if succeeds. bool wxTextCtrl::SaveFile(const wxString& file) { - wxString theFile(file); - if (theFile == "") - theFile = m_fileName; - if (theFile == "") - return FALSE; - m_fileName = theFile; + wxString theFile(file); - ofstream output((char*) (const char*) theFile); - if (output.bad()) - return FALSE; + if (theFile == "") + theFile = m_fileName; + + if (theFile == "") + return FALSE; + + m_fileName = theFile; + + ofstream output((char*) (const char*) theFile); + if (output.bad()) + return FALSE; // This will only save 64K max unsigned long nbytes = SendMessage((HWND) GetHWND(), WM_GETTEXTLENGTH, 0, 0); @@ -580,13 +619,13 @@ bool wxTextCtrl::SaveFile(const wxString& file) SendMessage((HWND) GetHWND(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)tmp_buffer); char *pstr = tmp_buffer; - // Convert \r\n to just \n - while (*pstr) - { - if (*pstr != '\r') - output << *pstr; - pstr++; - } + // Convert \r\n to just \n + while (*pstr) + { + if (*pstr != '\r') + output << *pstr; + pstr++; + } farfree(tmp_buffer); SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L); @@ -617,19 +656,24 @@ void wxTextCtrl::WriteText(const wxString& text) delete[] newtext; } -void wxTextCtrl::Clear(void) +void wxTextCtrl::AppendText(const wxString& text) +{ + SetInsertionPointEnd(); + WriteText(text); +} + +void wxTextCtrl::Clear() { -// SendMessage((HWND) GetHWND(), WM_SETTEXT, 0, (LPARAM)""); SetWindowText((HWND) GetHWND(), ""); } -bool wxTextCtrl::IsModified(void) const +bool wxTextCtrl::IsModified() const { return (SendMessage((HWND) GetHWND(), EM_GETMODIFY, 0, 0) != 0); } // Makes 'unmodified' -void wxTextCtrl::DiscardEdits(void) +void wxTextCtrl::DiscardEdits() { SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L); } @@ -638,8 +682,8 @@ void wxTextCtrl::DiscardEdits(void) * Some of the following functions are yet to be implemented * */ - -int wxTextCtrl::GetNumberOfLines(void) const + +int wxTextCtrl::GetNumberOfLines() const { return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0); } @@ -684,16 +728,11 @@ 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; -/* - wxDebugMsg("Caret line: %d; Current visible line: %d; Specified line: %d; lines to scroll: %d\n", - currentLineLineNo1, currentLineLineNo, specifiedLineLineNo, linesToScroll); -*/ + 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 @@ -713,10 +752,104 @@ wxString wxTextCtrl::GetLineText(long lineNo) const 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( (HWND) 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((HWND) GetHWND(), EM_UNDO, 0, 0); + } +} + +void wxTextCtrl::Redo() +{ + if (CanRedo()) + { + // Same as Undo, since Undo undoes the undo, i.e. a redo. + ::SendMessage((HWND) GetHWND(), EM_UNDO, 0, 0); + } +} + +bool wxTextCtrl::CanUndo() const +{ + return (::SendMessage((HWND) GetHWND(), EM_CANUNDO, 0, 0) != 0); +} + +bool wxTextCtrl::CanRedo() const +{ + return (::SendMessage((HWND) 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((HWND) 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((HWND) GetHWND(), EM_GETSEL, wParam, lParam); + + *from = dwStart; + *to = dwEnd; +} + +bool wxTextCtrl::IsEditable() const +{ + long style = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE); + return ((style & ES_READONLY) == 0); +} + void wxTextCtrl::Command(wxCommandEvent & event) { SetValue (event.GetString()); @@ -736,11 +869,11 @@ 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 -// Borland. See note in wb_text.h. +// Borland. See note in textctrl.h. #ifndef NO_TEXT_WINDOW_STREAM int wxTextCtrl::overflow(int c) { @@ -750,11 +883,11 @@ int wxTextCtrl::overflow(int c) #if wxUSE_IOSTREAMH if ( allocate()==EOF ) { - wxError("Streambuf allocation failed","Internal error"); + wxLogError("Streambuf allocation failed"); return EOF; } #endif - + // Verify that there are no characters in get area if ( gptr() && gptr() < egptr() ) { @@ -796,7 +929,7 @@ int wxTextCtrl::overflow(int c) txt[plen] = (char)c; // append c txt[plen+xtra] = '\0'; // append '\0' or overwrite c // If the put area already contained \0, output will be truncated there - WriteText(txt); + AppendText(txt); delete[] txt; } @@ -826,7 +959,7 @@ int wxTextCtrl::overflow(int c) //========================================================================= // called then "endl" is output (gcc) or then explicit sync is done (Borland) //========================================================================= -int wxTextCtrl::sync(void) +int wxTextCtrl::sync() { // Verify that there are no characters in get area if ( gptr() && gptr() < egptr() ) @@ -853,7 +986,7 @@ int wxTextCtrl::sync(void) //========================================================================= // Should not be called by a "ostream". Used by a "istream" //========================================================================= -int wxTextCtrl::underflow(void) +int wxTextCtrl::underflow() { return EOF; } @@ -861,15 +994,15 @@ int wxTextCtrl::underflow(void) wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) { - WriteText(s); - return *this; + AppendText(s); + return *this; } wxTextCtrl& wxTextCtrl::operator<<(float f) { wxString str; str.Printf("%.2f", f); - WriteText(str); + AppendText(str); return *this; } @@ -877,7 +1010,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d) { wxString str; str.Printf("%.2f", d); - WriteText(str); + AppendText(str); return *this; } @@ -885,7 +1018,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i) { wxString str; str.Printf("%d", i); - WriteText(str); + AppendText(str); return *this; } @@ -893,7 +1026,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i) { wxString str; str.Printf("%ld", i); - WriteText(str); + AppendText(str); return *this; } @@ -903,14 +1036,14 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c) buf[0] = c; buf[1] = 0; - WriteText(buf); + AppendText(buf); return *this; } WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { -#if CTL3D +#if wxUSE_CTL3D if ( m_useCtl3D ) { HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); @@ -937,35 +1070,69 @@ WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, void wxTextCtrl::OnChar(wxKeyEvent& event) { - if ( (event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) - { - wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); - event.SetEventObject( this ); - if ( GetEventHandler()->ProcessEvent(event) ) - return; - } - else if ( event.KeyCode() == WXK_TAB ) { - wxNavigationKeyEvent event; - event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100)); - event.SetWindowChange(FALSE); - event.SetEventObject(this); - - if ( GetEventHandler()->ProcessEvent(event) ) - return; - } + switch( event.KeyCode() ) + { + case WXK_RETURN: + if ( !(m_windowStyle & wxTE_MULTILINE) ) + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); + event.SetEventObject( this ); + if ( GetEventHandler()->ProcessEvent(event) ) + return; + } + //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 + // this key combo for himself) + // + // NB: Notice that Ctrl-Tab is handled elsewhere and Alt-Tab is + // handled by Windows + if ( event.ShiftDown() || !(m_windowStyle & wxTE_PROCESS_TAB) ) + { + wxNavigationKeyEvent eventNav; + eventNav.SetDirection(!event.ShiftDown()); + eventNav.SetWindowChange(FALSE); + eventNav.SetEventObject(this); + + if ( GetEventHandler()->ProcessEvent(eventNav) ) + return; + } + break; + + default: + event.Skip(); + return; + } - event.Skip(); + // 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(); } long wxTextCtrl::MSWGetDlgCode() { - long lRc = DLGC_WANTCHARS | DLGC_WANTARROWS; - if ( m_windowStyle & wxPROCESS_ENTER ) - lRc |= DLGC_WANTMESSAGE; - else if ( m_windowStyle & wxTE_MULTILINE ) - lRc |= DLGC_WANTMESSAGE; - - return lRc; + // we always want the characters and the arrows + long lRc = DLGC_WANTCHARS | DLGC_WANTARROWS; + + // we may have several different cases: + // 1. normal case: both TAB and ENTER are used for dialog navigation + // 2. ctrl which wants TAB for itself: ENTER is used to pass to the next + // control in the dialog + // 3. ctrl which wants ENTER for itself: TAB is used for dialog navigation + // 4. ctrl which wants both TAB and ENTER: Ctrl-ENTER is used to pass to + // the next control + if ( m_windowStyle & wxTE_PROCESS_ENTER ) + lRc |= DLGC_WANTMESSAGE; + if ( m_windowStyle & wxTE_PROCESS_TAB ) + lRc |= DLGC_WANTTAB; + + return lRc; } void wxTextCtrl::OnEraseBackground(wxEraseEvent& event) @@ -1034,7 +1201,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) : wxEVT_SET_FOCUS, m_windowId); event.SetEventObject( this ); - ProcessEvent(event); + GetEventHandler()->ProcessEvent(event); } break; @@ -1066,8 +1233,8 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) // For Rich Edit controls. Do we need it? #if 0 -#if defined(__WIN95__) -bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) +#if wxUSE_RICHEDIT +bool wxTextCtrl::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam) { wxCommandEvent event(0, m_windowId); int eventType = 0; @@ -1076,14 +1243,14 @@ bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) { // Insert case code here default : - return wxControl::MSWNotify(wParam, lParam); + return wxControl::MSWOnNotify(wParam, lParam); break; } event.SetEventObject( this ); event.SetEventType(eventType); - if ( !ProcessEvent(event) ) + if ( !GetEventHandler()->ProcessEvent(event) ) return FALSE; return TRUE; @@ -1091,3 +1258,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() ); +} +