X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c59147ba270a08e12089b59a1bacce9effea88a8..601d9e60e12e417584857fc430113346aecde105:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 5fc6c3e2ad..623a803942 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__ @@ -25,7 +25,7 @@ #include "wx/settings.h" #endif -#if USE_CLIPBOARD +#if wxUSE_CLIPBOARD #include "wx/app.h" #include "wx/clipbrd.h" #endif @@ -34,7 +34,15 @@ #include #include -#include "fstream.h" + +#if wxUSE_IOSTREAMH +#include +#else +#include +# ifdef _MSC_VER + using namespace std; +# endif +#endif #include #include @@ -59,9 +67,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 +80,18 @@ wxTextCtrl::wxTextCtrl(void) :streambuf() #endif { - fileName = ""; + m_fileName = ""; m_isRich = FALSE; } bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) + 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 +103,12 @@ bool wxTextCtrl::Create(wxWindow *parent, 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 +129,10 @@ bool wxTextCtrl::Create(wxWindow *parent, 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 ; @@ -138,16 +147,14 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, char *windowClass = "EDIT"; #if defined(__WIN95__) 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) ; @@ -158,36 +165,36 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, 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 ? (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 (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 @@ -195,19 +202,21 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, if ( parent->GetFont() && 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 +225,45 @@ bool wxTextCtrl::Create(wxWindow *parent, 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); + GetClassNameA((HWND) hWnd, buf, 256); #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 +273,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) @@ -321,7 +330,7 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags) wxGetCharSize(GetHWND(), &cx, &cy,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)) @@ -333,17 +342,17 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags) 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); @@ -504,11 +513,12 @@ bool wxTextCtrl::LoadFile(const wxString& file) if (!FileExists(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()) { @@ -530,13 +540,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); @@ -553,16 +563,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); @@ -570,13 +580,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); @@ -700,7 +710,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const *(WORD *)wxBuffer = 512; int noChars = (int)SendMessage(hWnd, EM_GETLINE, (WPARAM)lineNo, (LPARAM)wxBuffer); wxBuffer[noChars] = 0; - return wxString(wxBuffer); + return wxString(wxBuffer); } /* @@ -735,11 +745,15 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) 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"); return EOF; } +#endif // Verify that there are no characters in get area if ( gptr() && gptr() < egptr() ) @@ -756,7 +770,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 @@ -848,49 +867,48 @@ wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) 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<<(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<<(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<<(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(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) + WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { #if CTL3D if ( m_useCtl3D ) @@ -919,13 +937,29 @@ 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) ) + // 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)); @@ -1016,7 +1050,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) : wxEVT_SET_FOCUS, m_windowId); event.SetEventObject( this ); - ProcessEvent(event); + GetEventHandler()->ProcessEvent(event); } break; @@ -1051,24 +1085,24 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) #if defined(__WIN95__) 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