Fixed wxPalette memory leak when loading BMP files

[wxWidgets.git] / src / msw / textctrl.cpp

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index dc70319e757c3a7c804e0024ba155fa57e0d681a..558855f00020b8b50bede7dcfa3d136664766fbb 100644 (file)
--- 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"
 #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
 #endif
 
 #if wxUSE_CLIPBOARD


@@ -36,20 +39,21 @@
 #include <stdlib.h>
 
 #if wxUSE_IOSTREAMH
 #include <stdlib.h>
 
 #if wxUSE_IOSTREAMH

-#include <fstream.h>
+#   include <fstream.h>

 #else
 #else

-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <fstream>

 #endif
 
 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>

+#ifndef __MWERKS__

 #include <sys/stat.h>
 #include <sys/stat.h>

+#else
+#include <stat.h>
+#endif

 #if defined(__BORLANDC__) && !defined(__WIN32__)
 #include <alloc.h>
 #else
 #if defined(__BORLANDC__) && !defined(__WIN32__)
 #include <alloc.h>
 #else

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)

 #include <malloc.h>
 #endif
 #define farmalloc malloc
 #include <malloc.h>
 #endif
 #define farmalloc malloc


@@ -59,8 +63,8 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#if defined(__WIN95__) && !defined(__GNUWIN32__)
-#include <richedit.h>
+#if wxUSE_RICHEDIT && !defined(__GNUWIN32__)
+    #include <richedit.h>

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY


@@ -71,17 +75,17 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
   EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
   EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
 END_EVENT_TABLE()
   EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
   EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
 END_EVENT_TABLE()

-
-#endif
+#endif // USE_SHARED_LIBRARY

 
 // Text item
 
 // Text item

-wxTextCtrl::wxTextCtrl(void)
+wxTextCtrl::wxTextCtrl()

 #ifndef NO_TEXT_WINDOW_STREAM
 #ifndef NO_TEXT_WINDOW_STREAM

- :streambuf()
+          : streambuf()

 #endif
 {
 #endif
 {

-  m_fileName = "";
+#if wxUSE_RICHEDIT

   m_isRich = FALSE;
   m_isRich = FALSE;

+#endif

 }
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,


@@ -91,7 +95,6 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

-  m_fileName = "";

   SetName(name);
   SetValidator(validator);
   if (parent) parent->AddChild(this);
   SetName(name);
   SetValidator(validator);
   if (parent) parent->AddChild(this);


@@ -115,24 +118,15 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
   int width = size.x;
   int height = size.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)
   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 ;
 
   else
     msStyle |= ES_AUTOHSCROLL ;
 


@@ -144,8 +138,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
   if (m_windowStyle & wxTE_PASSWORD) // hidden input
     msStyle |= ES_PASSWORD;
 
   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;
   if ( m_windowStyle & wxTE_MULTILINE )
   {
     msStyle |= ES_AUTOVSCROLL;


@@ -153,19 +148,19 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     windowClass = "RichEdit" ;
   }
   else
     windowClass = "RichEdit" ;
   }
   else

-#endif

     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.
 
   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";
   if (m_windowStyle & wxSIMPLE_BORDER)
   {
     windowClass = "EDIT";

-  m_isRich = FALSE;
+    m_isRich = FALSE;

   }
 #endif
 
   }
 #endif
 


@@ -177,11 +172,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_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" );
 
 
   wxCHECK_MSG( m_hWnd, FALSE, "Failed to create text ctrl" );
 

-#if CTL3D
+#if wxUSE_CTL3D

   if ( want3D )
   {
     Ctl3dSubclassCtl((HWND)m_hWnd);
   if ( want3D )
   {
     Ctl3dSubclassCtl((HWND)m_hWnd);


@@ -189,7 +184,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
   }
 #endif
 
   }
 #endif
 

-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT

   if (m_isRich)
   {
     // Have to enable events
   if (m_isRich)
   {
     // Have to enable events


@@ -200,9 +195,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
   SubclassWin(GetHWND());
 
 
   SubclassWin(GetHWND());
 

-  if ( parent->GetFont() && parent->GetFont()->Ok() )
+  if ( parent->GetFont().Ok() && parent->GetFont().Ok() )

   {
   {

-  SetFont(* parent->GetFont());
+    SetFont(parent->GetFont());

   }
   else
   {
   }
   else
   {


@@ -223,23 +218,29 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)
 }
 
 // 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);
 
 {
   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);
 
 #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
 #else
   GetClassNameA((HWND) hWnd, buf, 256);
 #endif

+#endif

 #endif
 
   wxString str(buf);
 #endif
 
   wxString str(buf);


@@ -249,6 +250,7 @@ void wxTextCtrl::AdoptAttributesFromHWND(void)
     m_isRich = FALSE;
   else
     m_isRich = TRUE;
     m_isRich = FALSE;
   else
     m_isRich = TRUE;

+#endif

 
   if (style & ES_MULTILINE)
     m_windowStyle |= wxTE_MULTILINE;
 
   if (style & ES_MULTILINE)
     m_windowStyle |= wxTE_MULTILINE;


@@ -260,13 +262,13 @@ void wxTextCtrl::AdoptAttributesFromHWND(void)
     m_windowStyle |= wxTE_PROCESS_ENTER;
 }
 
     m_windowStyle |= wxTE_PROCESS_ENTER;
 }
 

-void wxTextCtrl::SetupColours(void)
+void wxTextCtrl::SetupColours()

 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
   SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
 {
   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];
 {
     int length = GetWindowTextLength((HWND) GetHWND());
     char *s = new char[length+1];


@@ -309,7 +311,7 @@ void wxTextCtrl::SetValue(const wxString& value)
     SetWindowText((HWND) GetHWND(), (const char *)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(&currentX, &currentY);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -328,7 +330,7 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cx; // button font dimensions
   int cy;
 
   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;
 
 
   int control_width, control_height, control_x, control_y;
 


@@ -359,19 +361,19 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 // Clipboard operations
 }
 
 // Clipboard operations

-void wxTextCtrl::Copy(void)
+void wxTextCtrl::Copy()

 {
   HWND hWnd = (HWND) GetHWND();
   SendMessage(hWnd, WM_COPY, 0, 0L);
 }
 
 {
   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);
 }
 
 {
   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();
   SendMessage(hWnd, WM_PASTE, 0, 0L);


@@ -387,7 +389,7 @@ void wxTextCtrl::SetInsertionPoint(long pos)
 {
   HWND hWnd = (HWND) GetHWND();
 #ifdef __WIN32__
 {
   HWND hWnd = (HWND) GetHWND();
 #ifdef __WIN32__

-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT

   if ( m_isRich)
   {
     CHARRANGE range;
   if ( m_isRich)
   {
     CHARRANGE range;


@@ -409,15 +411,15 @@ void wxTextCtrl::SetInsertionPoint(long pos)
   SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
 }
 
   SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
 }
 

-void wxTextCtrl::SetInsertionPointEnd(void)
+void wxTextCtrl::SetInsertionPointEnd()

 {
   long pos = GetLastPosition();
   SetInsertionPoint(pos);
 }
 
 {
   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;
   if (m_isRich)
   {
     CHARRANGE range;


@@ -432,7 +434,7 @@ long wxTextCtrl::GetInsertionPoint(void) const
   return Pos&0xFFFF;
 }
 
   return Pos&0xFFFF;
 }
 

-long wxTextCtrl::GetLastPosition(void) const
+long wxTextCtrl::GetLastPosition() const

 {
     HWND hWnd = (HWND) GetHWND();
 
 {
     HWND hWnd = (HWND) GetHWND();
 


@@ -451,6 +453,7 @@ long wxTextCtrl::GetLastPosition(void) const
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {

+#if wxUSE_CLIPBOARD

     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;
     long toChar = to;
     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;
     long toChar = to;


@@ -468,6 +471,9 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
 
     // Paste into edit control
     SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);
 
     // 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)
 }
 
 void wxTextCtrl::Remove(long from, long to)


@@ -510,7 +516,7 @@ void wxTextCtrl::SetSelection(long from, long to)
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {

-  if (!FileExists(WXSTRINGCAST file))
+  if (!wxFileExists(WXSTRINGCAST file))

     return FALSE;
 
   m_fileName = file;
     return FALSE;
 
   m_fileName = file;


@@ -528,9 +534,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...
 
       // 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;
       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.
 //      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 +576,19 @@ bool wxTextCtrl::LoadFile(const wxString& file)
 // Returns TRUE if succeeds.
 bool wxTextCtrl::SaveFile(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);
 
     // This will only save 64K max
     unsigned long nbytes = SendMessage((HWND) GetHWND(), WM_GETTEXTLENGTH, 0, 0);


@@ -580,13 +596,13 @@ bool wxTextCtrl::SaveFile(const wxString& file)
     SendMessage((HWND) GetHWND(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)tmp_buffer);
     char *pstr = tmp_buffer;
 
     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);
 
     farfree(tmp_buffer);
     SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);


@@ -617,19 +633,24 @@ void wxTextCtrl::WriteText(const wxString& text)
     delete[] newtext;
 }
 
     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(), "");
 }
 
     SetWindowText((HWND) GetHWND(), "");
 }
 

-bool wxTextCtrl::IsModified(void) const
+bool wxTextCtrl::IsModified() const

 {
     return (SendMessage((HWND) GetHWND(), EM_GETMODIFY, 0, 0) != 0);
 }
 
 // Makes 'unmodified'
 {
     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);
 }
 {
   SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);
 }


@@ -639,7 +660,7 @@ void wxTextCtrl::DiscardEdits(void)
  *
  */
  
  *
  */
  

-int wxTextCtrl::GetNumberOfLines(void) const
+int wxTextCtrl::GetNumberOfLines() const

 {
     return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
 }
 {
     return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
 }


@@ -687,11 +708,6 @@ void wxTextCtrl::ShowPosition(long pos)
     
     int linesToScroll = specifiedLineLineNo - currentLineLineNo;
 
     
     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));
 }
     if (linesToScroll != 0)
       (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)MAKELPARAM(linesToScroll, 0));
 }


@@ -740,7 +756,7 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 // or when "endl" is output (Borland 4.5)
 //=========================================================================
 // Class declaration using multiple inheritance doesn't work properly for
 // 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)
 {
 #ifndef NO_TEXT_WINDOW_STREAM
 int wxTextCtrl::overflow(int c)
 {


@@ -750,7 +766,7 @@ int wxTextCtrl::overflow(int c)
 #if wxUSE_IOSTREAMH
   if ( allocate()==EOF )
   {
 #if wxUSE_IOSTREAMH
   if ( allocate()==EOF )
   {

-    wxError("Streambuf allocation failed","Internal error");
+    wxLogError("Streambuf allocation failed");

     return EOF;
   }
 #endif
     return EOF;
   }
 #endif


@@ -796,7 +812,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
   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;
   }
 
     delete[] txt;
   }
 


@@ -826,7 +842,7 @@ int wxTextCtrl::overflow(int c)
 //=========================================================================
 // called then "endl" is output (gcc) or then explicit sync is done (Borland)
 //=========================================================================
 //=========================================================================
 // 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() )
 {
   // Verify that there are no characters in get area
   if ( gptr() && gptr() < egptr() )


@@ -853,7 +869,7 @@ int wxTextCtrl::sync(void)
 //=========================================================================
 // Should not be called by a "ostream". Used by a "istream"
 //=========================================================================
 //=========================================================================
 // Should not be called by a "ostream". Used by a "istream"
 //=========================================================================

-int wxTextCtrl::underflow(void)
+int wxTextCtrl::underflow()

 {
   return EOF;
 }
 {
   return EOF;
 }


@@ -861,15 +877,15 @@ int wxTextCtrl::underflow(void)
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 
 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);
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     wxString str;
     str.Printf("%.2f", f);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -877,7 +893,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     wxString str;
     str.Printf("%.2f", d);
 {
     wxString str;
     str.Printf("%.2f", d);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -885,7 +901,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     wxString str;
     str.Printf("%d", i);
 {
     wxString str;
     str.Printf("%d", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -893,7 +909,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     wxString str;
     str.Printf("%ld", i);
 {
     wxString str;
     str.Printf("%ld", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -903,14 +919,14 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
 
     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)
 {
     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);
   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);


@@ -937,35 +953,87 @@ WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
 
 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() )
+    {
+        // VZ: commented out until somebody explains to me what it does
+#if 0
+        // 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;
+#endif // 0
+
+        case WXK_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;
+        }
+
+        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;

 
 

-  event.Skip();
+        default:
+            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 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)
 }
 
 void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)


@@ -1034,7 +1102,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
                                                  : wxEVT_SET_FOCUS,
                            m_windowId);
         event.SetEventObject( this );
                                                  : wxEVT_SET_FOCUS,
                            m_windowId);
         event.SetEventObject( this );

-        ProcessEvent(event);
+        GetEventHandler()->ProcessEvent(event);

       }
       break;
 
       }
       break;
 


@@ -1066,7 +1134,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 
 // For Rich Edit controls. Do we need it?
 #if 0
 
 // 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);
 bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
 {
   wxCommandEvent event(0, m_windowId);


@@ -1083,7 +1151,7 @@ bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
   event.SetEventObject( this );
   event.SetEventType(eventType);
 
   event.SetEventObject( this );
   event.SetEventType(eventType);
 

-  if ( !ProcessEvent(event) )
+  if ( !GetEventHandler()->ProcessEvent(event) )

     return FALSE;
 
     return TRUE;
     return FALSE;
 
     return TRUE;