// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#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
#include <windows.h>
#include <stdlib.h>
-#include "fstream.h"
+
+#if wxUSE_IOSTREAMH
+# include <fstream.h>
+#else
+# include <fstream>
+#endif
#include <sys/types.h>
+#ifndef __MWERKS__
#include <sys/stat.h>
+#else
+#include <stat.h>
+#endif
#if defined(__BORLANDC__) && !defined(__WIN32__)
#include <alloc.h>
#else
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
#include <malloc.h>
#endif
#define farmalloc malloc
#include <string.h>
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
-#include <richedit.h>
+#if wxUSE_RICHEDIT && !defined(__GNUWIN32__)
+ #include <richedit.h>
#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_CHAR(wxTextCtrl::OnChar)
+ EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
+ EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
END_EVENT_TABLE()
-
-#endif
+#endif // USE_SHARED_LIBRARY
// Text item
-wxTextCtrl::wxTextCtrl(void)
+wxTextCtrl::wxTextCtrl()
#ifndef NO_TEXT_WINDOW_STREAM
- :streambuf()
+ : streambuf()
#endif
{
- fileName = "";
+#if wxUSE_RICHEDIT
m_isRich = FALSE;
+#endif
}
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 = "";
SetName(name);
SetValidator(validator);
if (parent) parent->AddChild(this);
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;
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 ;
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 )
-#else
- if ( FALSE )
-#endif
{
- msStyle |= ES_AUTOVSCROLL;
- m_isRich = TRUE;
- windowClass = "RichEdit" ;
+ msStyle |= ES_AUTOVSCROLL;
+ m_isRich = TRUE;
+ windowClass = "RichEdit" ;
}
else
- m_isRich = FALSE;
+ 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
// 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);
+ wxGetInstance(), NULL);
-#if CTL3D
+ wxCHECK_MSG( m_hWnd, FALSE, "Failed to create text ctrl" );
+
+#if wxUSE_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;
}
// Make sure the window style (etc.) reflects the HWND style (roughly)
-void wxTextCtrl::AdoptAttributesFromHWND(void)
+void wxTextCtrl::AdoptAttributesFromHWND()
{
- 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];
+ // 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);
+ 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;
#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;
+ 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)
+void wxTextCtrl::SetupColours()
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(GetParent()->GetDefaultForegroundColour());
+ SetForegroundColour(GetParent()->GetForegroundColour());
}
-wxString wxTextCtrl::GetValue(void) const
+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 str;
}
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);
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))
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);
}
// Clipboard operations
-void wxTextCtrl::Copy(void)
+void wxTextCtrl::Copy()
{
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);
}
-void wxTextCtrl::Paste(void)
+void wxTextCtrl::Paste()
{
HWND hWnd = (HWND) GetHWND();
SendMessage(hWnd, WM_PASTE, 0, 0L);
{
HWND hWnd = (HWND) GetHWND();
#ifdef __WIN32__
-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT
if ( m_isRich)
{
CHARRANGE range;
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;
return Pos&0xFFFF;
}
-long wxTextCtrl::GetLastPosition(void) const
+long wxTextCtrl::GetLastPosition() const
{
HWND hWnd = (HWND) GetHWND();
void wxTextCtrl::Replace(long from, long to, const wxString& value)
{
+#if wxUSE_CLIPBOARD
HWND hWnd = (HWND) GetHWND();
long fromChar = from;
long toChar = to;
// 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)
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())
{
// 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.
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);
// Returns TRUE if succeeds.
bool wxTextCtrl::SaveFile(const wxString& file)
{
- wxString theFile;
- if (file == "")
- theFile = fileName;
- if (file == "")
- return FALSE;
- fileName = theFile;
+ wxString theFile(file);
+
+ if (theFile == "")
+ theFile = m_fileName;
- ofstream output(WXSTRINGCAST file);
- if (output.bad())
- return FALSE;
+ 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);
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);
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);
}
*
*/
-int wxTextCtrl::GetNumberOfLines(void) const
+int wxTextCtrl::GetNumberOfLines() const
{
return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
}
int linesToScroll = specifiedLineLineNo - currentLineLineNo;
-/*
- wxDebugMsg("Caret line: %d; Current visible line: %d; Specified line: %d; lines to scroll: %d\n",
- currentLineLineNo1, currentLineLineNo, specifiedLineLineNo, linesToScroll);
-*/
-
if (linesToScroll != 0)
(void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)MAKELPARAM(linesToScroll, 0));
}
*(WORD *)wxBuffer = 512;
int noChars = (int)SendMessage(hWnd, EM_GETLINE, (WPARAM)lineNo, (LPARAM)wxBuffer);
wxBuffer[noChars] = 0;
- return wxString(wxBuffer);
+ return wxString(wxBuffer);
}
/*
// 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 <iostream> 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() )
{
/* 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
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;
}
//=========================================================================
// 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() )
//=========================================================================
// Should not be called by a "ostream". Used by a "istream"
//=========================================================================
-int wxTextCtrl::underflow(void)
+int wxTextCtrl::underflow()
{
return EOF;
}
wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
{
- WriteText(s);
- return *this;
+ AppendText(s);
+ return *this;
}
wxTextCtrl& wxTextCtrl::operator<<(float f)
{
- static char buf[100];
- sprintf(buf, "%.2f", f);
- WriteText(buf);
- return *this;
+ wxString str;
+ str.Printf("%.2f", f);
+ AppendText(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);
+ AppendText(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);
+ AppendText(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);
+ AppendText(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;
+ AppendText(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 wxUSE_CTL3D
if ( m_useCtl3D )
{
HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
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;
- }
-
- event.Skip();
-}
-
-long wxTextCtrl::MSWGetDlgCode()
-{
- long lRc = DLGC_WANTCHARS | DLGC_WANTARROWS;
- if ( m_windowStyle & wxPROCESS_ENTER ) {
- lRc |= DLGC_WANTMESSAGE;
- }
-
- return lRc;
-}
-
-/*
-long wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
- switch (nMsg)
+ switch( event.KeyCode() )
{
- case WM_GETDLGCODE:
- {
- if (GetWindowStyleFlag() & wxPROCESS_ENTER)
- return DLGC_WANTALLKEYS;
- break;
- }
- case WM_CHAR: // Always an ASCII character
- {
- if (wParam == VK_RETURN)
+ // 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:
{
- wxCommandEvent event(wxEVENT_TYPE_TEXT_ENTER_COMMAND);
- event.commandString = ((wxTextCtrl *)item)->GetValue();
- event.eventObject = item;
- item->ProcessCommand(event);
- return FALSE;
+/* 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 )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+ event.SetEventObject( this );
+ if ( GetEventHandler()->ProcessEvent(event) )
+ return;
+ }
+ //else: multiline controls need Enter for themselves
+
+ break;
}
- break;
- }
- default:
- 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;
}
+
+ // 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();
+}
- return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
+long wxTextCtrl::MSWGetDlgCode()
+{
+ // 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)
{
: wxEVT_SET_FOCUS,
m_windowId);
event.SetEventObject( this );
- ProcessEvent(event);
+ GetEventHandler()->ProcessEvent(event);
}
break;
// For Rich Edit controls. Do we need it?
#if 0
-#if defined(__WIN95__)
+#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
projects / wxWidgets.git / blobdiff