X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8b98f009e4631d5e5116a056a8fb230f7759c5c..8870c26ecb03e87065fdb3617b8c47ca3c923a53:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 2532bd4555..17cd5ae0c6 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -23,9 +23,12 @@ #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 USE_CLIPBOARD +#if wxUSE_CLIPBOARD #include "wx/app.h" #include "wx/clipbrd.h" #endif @@ -34,14 +37,26 @@ #include #include -#include "fstream.h" + +#if wxUSE_IOSTREAMH +#include +#else +#include +# ifdef _MSC_VER + using namespace std; +# endif +#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 @@ -51,7 +66,13 @@ #include -#if defined(__WIN95__) && !defined(__GNUWIN32__) +#if defined(__WIN95__) && !defined(__TWIN32__) +#define wxUSE_RICHEDIT 1 +#else +#define wxUSE_RICHEDIT 0 +#endif + +#if wxUSE_RICHEDIT && !defined(__GNUWIN32__) #include #endif @@ -59,9 +80,9 @@ 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_CHAR(wxTextCtrl::OnChar) + EVT_DROP_FILES(wxTextCtrl::OnDropFiles) + EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground) END_EVENT_TABLE() #endif @@ -72,18 +93,18 @@ wxTextCtrl::wxTextCtrl(void) :streambuf() #endif { - fileName = ""; + m_fileName = ""; m_isRich = FALSE; } -bool wxTextCtrl::Create(wxWindow *parent, const wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, const long style, - const wxValidator& validator, - const wxString& name) +bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, + const wxString& name) { - fileName = ""; + m_fileName = ""; SetName(name); SetValidator(validator); if (parent) parent->AddChild(this); @@ -95,12 +116,12 @@ bool wxTextCtrl::Create(wxWindow *parent, const wxWindowID id, SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(parent->GetDefaultForegroundColour()) ; + SetForegroundColour(parent->GetForegroundColour()) ; if ( id == -1 ) - m_windowId = (int)NewControlId(); + m_windowId = (int)NewControlId(); else - m_windowId = id; + m_windowId = id; int x = pos.x; int y = pos.y; @@ -121,9 +142,10 @@ bool wxTextCtrl::Create(wxWindow *parent, const wxWindowID id, // 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 + msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL ; // WS_BORDER else msStyle |= ES_AUTOHSCROLL ; @@ -136,78 +158,78 @@ bool wxTextCtrl::Create(wxWindow *parent, const wxWindowID id, msStyle |= ES_PASSWORD; char *windowClass = "EDIT"; -#if defined(__WIN95__) +#if wxUSE_RICHEDIT if ( m_windowStyle & wxTE_MULTILINE ) -#else - if ( FALSE ) -#endif { - msStyle |= ES_AUTOVSCROLL; - m_isRich = TRUE; - windowClass = "RichEdit" ; + msStyle |= ES_AUTOVSCROLL; + m_isRich = TRUE; + windowClass = "RichEdit" ; } else - m_isRich = FALSE; +#endif + m_isRich = FALSE; 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 // Even with extended styles, need to combine with WS_BORDER // for them to look right. - if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER)) + if ( want3D || wxStyleHasBorder(m_windowStyle) ) msStyle |= WS_BORDER; - HWND edit = CreateWindowEx(exStyle, windowClass, NULL, + m_hWnd = (WXHWND)::CreateWindowEx(exStyle, windowClass, NULL, msStyle, 0, 0, 0, 0, (HWND) ((wxWindow*)parent)->GetHWND(), (HMENU)m_windowId, - m_globalHandle ? (HANDLE) m_globalHandle : wxGetInstance(), NULL); + m_globalHandle ? (HINSTANCE) m_globalHandle : wxGetInstance(), NULL); + + wxCHECK_MSG( m_hWnd, FALSE, "Failed to create text ctrl" ); #if CTL3D if ( want3D ) { - Ctl3dSubclassCtl(edit); - m_useCtl3D = TRUE; + Ctl3dSubclassCtl((HWND)m_hWnd); + m_useCtl3D = TRUE; } #endif - m_hWnd = (WXHWND)edit; - -#if defined(__WIN95__) +#if wxUSE_RICHEDIT if (m_isRich) { - // Have to enable events - ::SendMessage(edit, EM_SETEVENTMASK, 0, ENM_CHANGE | ENM_DROPFILES | ENM_SELCHANGE | ENM_UPDATE); + // Have to enable events + ::SendMessage((HWND)m_hWnd, EM_SETEVENTMASK, 0, + ENM_CHANGE | ENM_DROPFILES | ENM_SELCHANGE | ENM_UPDATE); } #endif SubclassWin(GetHWND()); - if ( parent->GetFont() && parent->GetFont()->Ok() ) + if ( parent->GetFont().Ok() && parent->GetFont().Ok() ) { - SetFont(* parent->GetFont()); + SetFont(parent->GetFont()); } else { - SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT)); + SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT)); } SetSize(x, y, width, height); // Causes a crash for Symantec C++ and WIN32 for some reason #if !(defined(__SC__) && defined(__WIN32__)) - if (value != "") - SetWindowText(edit, (const char *)value); + if ( !value.IsEmpty() ) + { + SetValue(value); + } #endif return TRUE; @@ -216,45 +238,49 @@ bool wxTextCtrl::Create(wxWindow *parent, const wxWindowID id, // Make sure the window style (etc.) reflects the HWND style (roughly) void wxTextCtrl::AdoptAttributesFromHWND(void) { - wxWindow::AdoptAttributesFromHWND(); + wxWindow::AdoptAttributesFromHWND(); - HWND hWnd = (HWND) GetHWND(); - long style = GetWindowLong((HWND) hWnd, GWL_STYLE); + HWND hWnd = (HWND) GetHWND(); + long style = GetWindowLong((HWND) hWnd, GWL_STYLE); char buf[256]; #ifndef __WIN32__ - GetClassName((HWND) hWnd, buf, 256); + GetClassName((HWND) hWnd, buf, 256); #else #ifdef UNICODE - GetClassNameW((HWND) hWnd, buf, 256); + GetClassNameW((HWND) hWnd, buf, 256); #else - GetClassNameA((HWND) hWnd, buf, 256); +#ifdef __TWIN32__ + GetClassName((HWND) hWnd, buf, 256); +#else + GetClassNameA((HWND) hWnd, buf, 256); +#endif #endif #endif - wxString str(buf); - str.UpperCase(); - - if (str == "EDIT") - m_isRich = FALSE; - else - m_isRich = TRUE; - - if (style & ES_MULTILINE) - m_windowStyle |= wxTE_MULTILINE; - if (style & ES_PASSWORD) - m_windowStyle |= wxTE_PASSWORD; - if (style & ES_READONLY) - m_windowStyle |= wxTE_READONLY; - if (style & ES_WANTRETURN) - m_windowStyle |= wxTE_PROCESS_ENTER; + wxString str(buf); + str.UpperCase(); + + if (str == "EDIT") + m_isRich = FALSE; + else + m_isRich = TRUE; + + if (style & ES_MULTILINE) + m_windowStyle |= wxTE_MULTILINE; + if (style & ES_PASSWORD) + m_windowStyle |= wxTE_PASSWORD; + if (style & ES_READONLY) + m_windowStyle |= wxTE_READONLY; + if (style & ES_WANTRETURN) + m_windowStyle |= wxTE_PROCESS_ENTER; } void wxTextCtrl::SetupColours(void) { SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(GetParent()->GetDefaultForegroundColour()); + SetForegroundColour(GetParent()->GetForegroundColour()); } wxString wxTextCtrl::GetValue(void) const @@ -264,7 +290,7 @@ wxString wxTextCtrl::GetValue(void) const GetWindowText((HWND) GetHWND(), s, length+1); wxString str(s); delete[] s; - return str; + return str; } void wxTextCtrl::SetValue(const wxString& value) @@ -300,7 +326,7 @@ void wxTextCtrl::SetValue(const wxString& value) SetWindowText((HWND) GetHWND(), (const char *)value); } -void wxTextCtrl::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags) +void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -314,12 +340,14 @@ void wxTextCtrl::SetSize(const int x, const int y, const int width, const int he if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) y1 = currentY; + AdjustForParentClientOrigin(x1, y1, sizeFlags); + int cx; // button font dimensions int cy; - wxGetCharSize(GetHWND(), &cx, &cy,GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); - float control_width, control_height, control_x, control_y; + int control_width, control_height, control_x, control_y; // If we're prepared to use the existing size, then... if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) @@ -331,29 +359,20 @@ void wxTextCtrl::SetSize(const int x, const int y, const int width, const int he if (w1<=0) w1 = DEFAULT_ITEM_WIDTH; - control_x = (float)x1; - control_y = (float)y1; - control_width = (float)w1; - control_height = (float)h1; + control_x = x1; + control_y = y1; + control_width = w1; + control_height = h1; // Calculations may have made text size too small if (control_height <= 0) - control_height = (float)(int)(cy*EDIT_CONTROL_FACTOR) ; + control_height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); if (control_width <= 0) - control_width = (float)DEFAULT_ITEM_WIDTH; + control_width = DEFAULT_ITEM_WIDTH; MoveWindow((HWND) GetHWND(), (int)control_x, (int)control_y, (int)control_width, (int)control_height, TRUE); -/* -#if WXWIN_COMPATIBILITY - GetEventHandler()->OldOnSize(width, height); -#else - wxSizeEvent event(wxSize(width, height), m_windowId); - event.eventObject = this; - GetEventHandler()->ProcessEvent(event); -#endif -*/ } // Clipboard operations @@ -375,17 +394,17 @@ void wxTextCtrl::Paste(void) SendMessage(hWnd, WM_PASTE, 0, 0L); } -void wxTextCtrl::SetEditable(const bool editable) +void wxTextCtrl::SetEditable(bool editable) { HWND hWnd = (HWND) GetHWND(); SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L); } -void wxTextCtrl::SetInsertionPoint(const long pos) +void wxTextCtrl::SetInsertionPoint(long pos) { HWND hWnd = (HWND) GetHWND(); #ifdef __WIN32__ -#if defined(__WIN95__) +#if wxUSE_RICHEDIT if ( m_isRich) { CHARRANGE range; @@ -415,7 +434,7 @@ void wxTextCtrl::SetInsertionPointEnd(void) long wxTextCtrl::GetInsertionPoint(void) const { -#if defined(__WIN95__) +#if wxUSE_RICHEDIT if (m_isRich) { CHARRANGE range; @@ -447,7 +466,7 @@ long wxTextCtrl::GetLastPosition(void) const return (long)(charIndex + lineLength); } -void wxTextCtrl::Replace(const long from, const long to, const wxString& value) +void wxTextCtrl::Replace(long from, long to, const wxString& value) { HWND hWnd = (HWND) GetHWND(); long fromChar = from; @@ -462,13 +481,13 @@ void wxTextCtrl::Replace(const long from, const long to, const wxString& value) SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0); // Now replace with 'value', by pasting. - wxSetClipboardData(wxCF_TEXT, (wxObject *) (const char *)value, 0, 0); + wxSetClipboardData(wxDF_TEXT, (wxObject *) (const char *)value, 0, 0); // Paste into edit control SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L); } -void wxTextCtrl::Remove(const long from, const long to) +void wxTextCtrl::Remove(long from, long to) { HWND hWnd = (HWND) GetHWND(); long fromChar = from; @@ -483,7 +502,7 @@ void wxTextCtrl::Remove(const long from, const long to) SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0); } -void wxTextCtrl::SetSelection(const long from, const long to) +void wxTextCtrl::SetSelection(long from, long to) { HWND hWnd = (HWND) GetHWND(); long fromChar = from; @@ -508,14 +527,15 @@ void wxTextCtrl::SetSelection(const long from, const long to) bool wxTextCtrl::LoadFile(const wxString& file) { - if (!FileExists(WXSTRINGCAST file)) + if (!wxFileExists(WXSTRINGCAST file)) return FALSE; - fileName = file; + m_fileName = file; Clear(); - ifstream input(WXSTRINGCAST file, ios::nocreate | ios::in); +// ifstream input(WXSTRINGCAST file, ios::nocreate | ios::in); + ifstream input(WXSTRINGCAST file, ios::in); if (!input.bad()) { @@ -525,9 +545,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. @@ -537,13 +564,13 @@ bool wxTextCtrl::LoadFile(const wxString& file) while (!input.eof() && input.peek() != EOF) { input.getline(wxBuffer, 500); - int len = strlen(wxBuffer); - wxBuffer[len] = 13; - wxBuffer[len+1] = 10; - wxBuffer[len+2] = 0; - strcpy(tmp_buffer+pos, wxBuffer); - pos += strlen(wxBuffer); - no_lines++; + int len = strlen(wxBuffer); + wxBuffer[len] = 13; + wxBuffer[len+1] = 10; + wxBuffer[len+2] = 0; + strcpy(tmp_buffer+pos, wxBuffer); + pos += strlen(wxBuffer); + no_lines++; } // SendMessage((HWND) GetHWND(), WM_SETTEXT, 0, (LPARAM)tmp_buffer); @@ -560,16 +587,16 @@ bool wxTextCtrl::LoadFile(const wxString& file) // Returns TRUE if succeeds. bool wxTextCtrl::SaveFile(const wxString& file) { - wxString theFile; - if (file == "") - theFile = fileName; - if (file == "") + wxString theFile(file); + if (theFile == "") + theFile = m_fileName; + if (theFile == "") return FALSE; - fileName = theFile; + m_fileName = theFile; - ofstream output(WXSTRINGCAST file); + ofstream output((char*) (const char*) theFile); if (output.bad()) - return FALSE; + return FALSE; // This will only save 64K max unsigned long nbytes = SendMessage((HWND) GetHWND(), WM_GETTEXTLENGTH, 0, 0); @@ -577,13 +604,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); @@ -641,7 +668,7 @@ int wxTextCtrl::GetNumberOfLines(void) const return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0); } -long wxTextCtrl::XYToPosition(const long x, const long y) const +long wxTextCtrl::XYToPosition(long x, long y) const { HWND hWnd = (HWND) GetHWND(); @@ -650,7 +677,7 @@ long wxTextCtrl::XYToPosition(const long x, const long y) const return (long)(x + charIndex); } -void wxTextCtrl::PositionToXY(const long pos, long *x, long *y) const +void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const { HWND hWnd = (HWND) GetHWND(); @@ -663,7 +690,7 @@ void wxTextCtrl::PositionToXY(const long pos, long *x, long *y) const *y = (long)lineNo; } -void wxTextCtrl::ShowPosition(const long pos) +void wxTextCtrl::ShowPosition(long pos) { HWND hWnd = (HWND) GetHWND(); @@ -693,7 +720,7 @@ void wxTextCtrl::ShowPosition(const long pos) (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)MAKELPARAM(linesToScroll, 0)); } -int wxTextCtrl::GetLineLength(const long lineNo) const +int wxTextCtrl::GetLineLength(long lineNo) const { long charIndex = XYToPosition(0, lineNo); HWND hWnd = (HWND) GetHWND(); @@ -701,13 +728,13 @@ int wxTextCtrl::GetLineLength(const long lineNo) const return len; } -wxString wxTextCtrl::GetLineText(const long lineNo) const +wxString wxTextCtrl::GetLineText(long lineNo) const { HWND hWnd = (HWND) GetHWND(); *(WORD *)wxBuffer = 512; int noChars = (int)SendMessage(hWnd, EM_GETLINE, (WPARAM)lineNo, (LPARAM)wxBuffer); wxBuffer[noChars] = 0; - return wxString(wxBuffer); + return wxString(wxBuffer); } /* @@ -737,16 +764,20 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) // 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) { // Make sure there is a holding area + // this is not needed in usage as it automagically allocates + // it, but does someone want to emulate it for safety's sake? +#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() ) @@ -763,7 +794,12 @@ int wxTextCtrl::overflow(int c) { /* This doesn't seem to be fatal so comment out error message */ // wxError("Put area not opened","Internal error"); - setp( base(), base() ); + +#if wxUSE_IOSTREAMH + setp( base(), base() ); +#else + setp( pbase(), pbase() ); +#endif } // Determine how many characters have been inserted but no consumed @@ -853,51 +889,50 @@ wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) return *this; } -wxTextCtrl& wxTextCtrl::operator<<(const float f) +wxTextCtrl& wxTextCtrl::operator<<(float f) { - static char buf[100]; - sprintf(buf, "%.2f", f); - WriteText(buf); - return *this; + wxString str; + str.Printf("%.2f", f); + WriteText(str); + return *this; } -wxTextCtrl& wxTextCtrl::operator<<(const double d) +wxTextCtrl& wxTextCtrl::operator<<(double d) { - static char buf[100]; - sprintf(buf, "%.2f", d); - WriteText(buf); - return *this; + wxString str; + str.Printf("%.2f", d); + WriteText(str); + return *this; } -wxTextCtrl& wxTextCtrl::operator<<(const int i) +wxTextCtrl& wxTextCtrl::operator<<(int i) { - static char buf[100]; - sprintf(buf, "%i", i); - WriteText(buf); - return *this; + wxString str; + str.Printf("%d", i); + WriteText(str); + return *this; } -wxTextCtrl& wxTextCtrl::operator<<(const long i) +wxTextCtrl& wxTextCtrl::operator<<(long i) { - static char buf[100]; - sprintf(buf, "%ld", i); - WriteText(buf); - return *this; + wxString str; + str.Printf("%ld", i); + WriteText(str); + return *this; } wxTextCtrl& wxTextCtrl::operator<<(const char c) { - char buf[2]; + char buf[2]; - buf[0] = c; - buf[1] = 0; - WriteText(buf); - return *this; + buf[0] = c; + buf[1] = 0; + WriteText(buf); + return *this; } - -WXHBRUSH wxTextCtrl::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, + WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { #if CTL3D if ( m_useCtl3D ) @@ -926,46 +961,54 @@ WXHBRUSH wxTextCtrl::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT 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) ) - event.Skip(); - } - else - event.Skip(); + // Fix by Marcel Rasche to allow Alt-Ctrl insertion of special characters + switch(event.KeyCode()) + { + case '{': + case '}': + case '[': + case ']': + case '|': + case '~': + case '\\': + { + char c=(char)event.KeyCode(); + *this << c; + } + break; + } + 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; + } + + event.Skip(); } -long wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +long wxTextCtrl::MSWGetDlgCode() { -/* - switch (nMsg) - { - case WM_GETDLGCODE: - { - if (GetWindowStyleFlag() & wxPROCESS_ENTER) - return DLGC_WANTALLKEYS; - break; - } - case WM_CHAR: // Always an ASCII character - { - if (wParam == VK_RETURN) - { - wxCommandEvent event(wxEVENT_TYPE_TEXT_ENTER_COMMAND); - event.commandString = ((wxTextCtrl *)item)->GetValue(); - event.eventObject = item; - item->ProcessCommand(event); - return FALSE; - } - break; - } - default: - break; - } -*/ - - return wxWindow::MSWWindowProc(nMsg, wParam, lParam); + long lRc = DLGC_WANTCHARS | DLGC_WANTARROWS; + if ( m_windowStyle & wxTE_PROCESS_ENTER ) + lRc |= DLGC_WANTMESSAGE; + else if ( m_windowStyle & wxTE_MULTILINE ) + lRc |= DLGC_WANTMESSAGE; + // ?? + if ( m_windowStyle & wxTE_PROCESS_TAB ) + lRc |= DLGC_WANTTAB; + + return lRc; } void wxTextCtrl::OnEraseBackground(wxEraseEvent& event) @@ -989,7 +1032,7 @@ void wxTextCtrl::OnEraseBackground(wxEraseEvent& event) // wxWindow::OnEraseBackground(event); } -bool wxTextCtrl::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id)) +bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { /* // Debugging @@ -1025,70 +1068,68 @@ bool wxTextCtrl::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id)) break; } */ - WXTYPE eventTyp = 0; switch (param) { case EN_SETFOCUS: - eventTyp = wxEVENT_TYPE_SET_FOCUS; - break; case EN_KILLFOCUS: - eventTyp = wxEVENT_TYPE_KILL_FOCUS; + { + wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS + : wxEVT_SET_FOCUS, + m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + } break; - case EN_UPDATE: - break; + case EN_CHANGE: - eventTyp = wxEVENT_TYPE_TEXT_COMMAND; + { + 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: - break; case EN_MAXTEXT: - break; case EN_HSCROLL: - break; case EN_VSCROLL: - break; default: - break; + return FALSE; } - if (eventTyp != 0) - { - wxCommandEvent event(eventTyp, m_windowId); - wxString val(GetValue()); - if ( !val.IsNull() ) - event.m_commandString = WXSTRINGCAST val; - event.SetEventObject( this ); - ProcessCommand(event); - return TRUE; - } - else - return FALSE; + // processed + return TRUE; } // For Rich Edit controls. Do we need it? #if 0 -#if defined(__WIN95__) -bool wxTextCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam) +#if wxUSE_RICHEDIT +bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) { - wxCommandEvent event(0, m_windowId); - int eventType = 0; - NMHDR *hdr1 = (NMHDR *) lParam; - switch ( hdr1->code ) - { - // Insert case code here - default : - return wxControl::MSWNotify(wParam, lParam); - break; - } - - event.SetEventObject( this ); - event.SetEventType(eventType); - - if ( !ProcessEvent(event) ) - return FALSE; - - return TRUE; + wxCommandEvent event(0, m_windowId); + int eventType = 0; + NMHDR *hdr1 = (NMHDR *) lParam; + switch ( hdr1->code ) + { + // Insert case code here + default : + return wxControl::MSWNotify(wParam, lParam); + break; + } + + event.SetEventObject( this ); + event.SetEventType(eventType); + + if ( !GetEventHandler()->ProcessEvent(event) ) + return FALSE; + + return TRUE; } #endif #endif