set more event object fields for lbox dbl click events

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index fa1c2a47c5006927d9bbaae2c8842745e2e905af..0ff8cd44072ce49697b7be7ba17fa900341b93e9 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.cpp
+// Name:        msw/textctrl.cpp

 // Purpose:     wxTextCtrl
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxTextCtrl
 // Author:      Julian Smart
 // Modified by:


@@ -38,6 +38,8 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

+#include "wx/module.h"
+

 #if wxUSE_CLIPBOARD
     #include "wx/clipbrd.h"
 #endif
 #if wxUSE_CLIPBOARD
     #include "wx/clipbrd.h"
 #endif


@@ -58,7 +60,7 @@
 #   include <fstream>
 #endif
 
 #   include <fstream>
 #endif
 

-#if wxUSE_RICHEDIT && (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
+#if wxUSE_RICHEDIT && !defined(__GNUWIN32_OLD__)

     #include <richedit.h>
 #endif
 
     #include <richedit.h>
 #endif
 


@@ -119,6 +121,9 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
     EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)

+#ifdef __WIN16__
+    EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
+#endif

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -152,17 +157,13 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     if ( parent )
         parent->AddChild(this);
 
     if ( parent )
         parent->AddChild(this);
 

-    // set colours
-    SetupColours();
-

     // translate wxWin style flags to MSW ones, checking for consistency while
     // doing it
     // translate wxWin style flags to MSW ones, checking for consistency while
     // doing it

-    long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP;
+    long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP /* | WS_CLIPSIBLINGS */ ;

     if ( m_windowStyle & wxTE_MULTILINE )
     {
         wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
     if ( m_windowStyle & wxTE_MULTILINE )
     {
         wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),

-                      wxT("wxTE_PROCESS_ENTER style is ignored for multiline "
-                          "text controls (they always process it)") );
+                      wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") );

 
         msStyle |= ES_MULTILINE | ES_WANTRETURN;
         if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
 
         msStyle |= ES_MULTILINE | ES_WANTRETURN;
         if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)


@@ -178,11 +179,13 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     if (m_windowStyle & wxTE_READONLY)
         msStyle |= ES_READONLY;
 
     if (m_windowStyle & wxTE_READONLY)
         msStyle |= ES_READONLY;
 

-    if (m_windowStyle & wxHSCROLL)
-        msStyle |= (WS_HSCROLL | ES_AUTOHSCROLL);

     if (m_windowStyle & wxTE_PASSWORD) // hidden input
         msStyle |= ES_PASSWORD;
 
     if (m_windowStyle & wxTE_PASSWORD) // hidden input
         msStyle |= ES_PASSWORD;
 

+   if (m_windowStyle & wxTE_AUTO_SCROLL)
+        msStyle |=  ES_AUTOHSCROLL;
+
+

     // we always want the characters and the arrows
     m_lDlgCode = DLGC_WANTCHARS | DLGC_WANTARROWS;
 
     // we always want the characters and the arrows
     m_lDlgCode = DLGC_WANTCHARS | DLGC_WANTARROWS;
 


@@ -213,9 +216,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
             // done)
             if ( !wxRichEditModule::Load() )
             {
             // done)
             if ( !wxRichEditModule::Load() )
             {

-                wxLogError(_("Impossible to create a rich edit control, "
-                             "using simple text control instead. Please "
-                             "reinstall riched32.dll"));
+                wxLogError(_("Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"));

 
                 s_errorGiven = TRUE;
             }
 
                 s_errorGiven = TRUE;
             }


@@ -240,7 +241,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 #ifndef RICHEDIT_CLASS
                 wxString RICHEDIT_CLASS;
                 RICHEDIT_CLASS.Printf(_T("RichEdit%d0"), ver);
 #ifndef RICHEDIT_CLASS
                 wxString RICHEDIT_CLASS;
                 RICHEDIT_CLASS.Printf(_T("RichEdit%d0"), ver);

-#ifdef wxUSE_UNICODE
+#if wxUSE_UNICODE

                 RICHEDIT_CLASS += _T('W');
 #else // ANSI
                 RICHEDIT_CLASS += _T('A');
                 RICHEDIT_CLASS += _T('W');
 #else // ANSI
                 RICHEDIT_CLASS += _T('A');


@@ -267,7 +268,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     //     might be -1 in which case we should use the default values (and
     //     SetSize called below takes care of it)
     m_hWnd = (WXHWND)::CreateWindowEx(exStyle,
     //     might be -1 in which case we should use the default values (and
     //     SetSize called below takes care of it)
     m_hWnd = (WXHWND)::CreateWindowEx(exStyle,

-                                      windowClass,
+                                      windowClass.c_str(),

                                       NULL,
                                       msStyle,
                                       0, 0, 0, 0,
                                       NULL,
                                       msStyle,
                                       0, 0, 0, 0,


@@ -316,6 +317,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     }
 #endif
 
     }
 #endif
 

+    // set colours
+    SetupColours();
+

     SetSize(pos.x, pos.y, size.x, size.y);
 
     return TRUE;
     SetSize(pos.x, pos.y, size.x, size.y);
 
     return TRUE;


@@ -353,8 +357,13 @@ void wxTextCtrl::AdoptAttributesFromHWND()
 
 void wxTextCtrl::SetupColours()
 {
 
 void wxTextCtrl::SetupColours()
 {

-    // FIXME why is bg colour not inherited from parent?
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    wxColour bkgndColour;
+//    if (IsEditable() || (m_windowStyle & wxTE_MULTILINE))
+        bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
+//    else
+//        bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+
+    SetBackgroundColour(bkgndColour);

     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 


@@ -369,9 +378,9 @@ wxString wxTextCtrl::GetValue() const
 #if wxUSE_RICHEDIT
     if ( m_isRich )
     {
 #if wxUSE_RICHEDIT
     if ( m_isRich )
     {

-        wxString str;
-

         int len = GetWindowTextLength(GetHwnd()) + 1;
         int len = GetWindowTextLength(GetHwnd()) + 1;

+
+        wxString str;

         wxChar *p = str.GetWriteBuf(len);
 
         TEXTRANGE textRange;
         wxChar *p = str.GetWriteBuf(len);
 
         TEXTRANGE textRange;


@@ -414,7 +423,15 @@ void wxTextCtrl::SetValue(const wxString& value)
     {
         wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos);
 
     {
         wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos);
 

-        SetWindowText(GetHwnd(), valueDos);
+        SetWindowText(GetHwnd(), valueDos.c_str());
+
+        // for compatibility with the GTK and because it is more logical, we
+        // move the cursor to the end of the text after SetValue()
+
+        // GRG, Jun/2000: Changed this back after a lot of discussion
+        //   in the lists. wxWindows 2.2 will have a set of flags to
+        //   customize this behaviour.
+        //SetInsertionPointEnd();

 
         AdjustSpaceLimit();
     }
 
         AdjustSpaceLimit();
     }


@@ -476,7 +493,7 @@ bool wxTextCtrl::CanCopy() const
     // Can copy if there's a selection
     long from, to;
     GetSelection(& from, & to);
     // Can copy if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to);
+    return (from != to) ;

 }
 
 bool wxTextCtrl::CanCut() const
 }
 
 bool wxTextCtrl::CanCut() const


@@ -484,7 +501,7 @@ bool wxTextCtrl::CanCut() const
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to);
+    return (from != to) && (IsEditable());

 }
 
 bool wxTextCtrl::CanPaste() const
 }
 
 bool wxTextCtrl::CanPaste() const


@@ -543,7 +560,7 @@ void wxTextCtrl::SetInsertionPoint(long pos)
     SendMessage(hWnd, EM_SETSEL, 0, MAKELPARAM(pos, pos));
 #endif // Win32/16
 
     SendMessage(hWnd, EM_SETSEL, 0, MAKELPARAM(pos, pos));
 #endif // Win32/16
 

-    static const char *nothing = "";
+    static const wxChar *nothing = _T("");

     SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
 }
 
     SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
 }
 


@@ -797,14 +814,19 @@ int wxTextCtrl::GetLineLength(long lineNo) const
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
     size_t len = (size_t)GetLineLength(lineNo) + 1;
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
     size_t len = (size_t)GetLineLength(lineNo) + 1;

-    char *buf = (char *)malloc(len);
-    *(WORD *)buf = len;
-    int noChars = (int)SendMessage(GetHwnd(), EM_GETLINE, lineNo, (LPARAM)buf);
-    buf[noChars] = 0;

 
 

-    wxString str(buf);
+    // there must be at least enough place for the length WORD in the
+    // buffer
+    len += sizeof(WORD);

 
 

-    free(buf);
+    wxString str;
+    wxChar *buf = str.GetWriteBuf(len);
+
+    *(WORD *)buf = len;
+    len = (size_t)::SendMessage(GetHwnd(), EM_GETLINE, lineNo, (LPARAM)buf);
+    buf[len] = 0;
+
+    str.UngetWriteBuf(len);

 
     return str;
 }
 
     return str;
 }


@@ -867,7 +889,8 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             if ( !(m_windowStyle & wxTE_MULTILINE) )
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
             if ( !(m_windowStyle & wxTE_MULTILINE) )
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);

-                event.SetEventObject( this );
+                InitCommandEvent(event);
+                event.SetString(GetValue());

                 if ( GetEventHandler()->ProcessEvent(event) )
                     return;
             }
                 if ( GetEventHandler()->ProcessEvent(event) )
                     return;
             }


@@ -880,30 +903,19 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             // ourselves the fact that we got here means that the user code
             // decided to skip processing of this TAB - probably to let it
             // do its default job.
             // ourselves the fact that we got here means that the user code
             // decided to skip processing of this TAB - probably to let it
             // do its default job.

-            //
-            // NB: Notice that Ctrl-Tab is handled elsewhere and Alt-Tab is
-            //     handled by Windows

             {
                 wxNavigationKeyEvent eventNav;
                 eventNav.SetDirection(!event.ShiftDown());
             {
                 wxNavigationKeyEvent eventNav;
                 eventNav.SetDirection(!event.ShiftDown());

-                eventNav.SetWindowChange(FALSE);
+                eventNav.SetWindowChange(event.ControlDown());

                 eventNav.SetEventObject(this);
 
                 eventNav.SetEventObject(this);
 

-                if ( GetEventHandler()->ProcessEvent(eventNav) )
+                if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )

                     return;
             }
             break;
                     return;
             }
             break;

-
-        default:
-            event.Skip();
-            return;

     }
 
     }
 

-    // 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
-
-    // FIXME
+    // no, we didn't process it

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -925,10 +937,8 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         case EN_CHANGE:
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         case EN_CHANGE:
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);

-                wxString val(GetValue());
-                if ( !val.IsNull() )
-                    event.m_commandString = WXSTRINGCAST val;
-                event.SetEventObject( this );
+                InitCommandEvent(event);
+                event.SetString(GetValue());

                 ProcessCommand(event);
             }
             break;
                 ProcessCommand(event);
             }
             break;


@@ -943,6 +953,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         case EN_ERRSPACE:
         case EN_HSCROLL:
         case EN_VSCROLL:
         case EN_ERRSPACE:
         case EN_HSCROLL:
         case EN_VSCROLL:

+            return FALSE;

         default:
             return FALSE;
     }
         default:
             return FALSE;
     }


@@ -951,6 +962,71 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     return TRUE;
 }
 
     return TRUE;
 }
 

+WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+                               WXUINT message,
+                               WXWPARAM wParam,
+                               WXLPARAM lParam)
+{
+#if wxUSE_CTL3D
+    if ( m_useCtl3D )
+    {
+        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
+        return (WXHBRUSH) hbrush;
+    }
+#endif // wxUSE_CTL3D
+
+    HDC hdc = (HDC)pDC;
+    if (GetParent()->GetTransparentBackground())
+        SetBkMode(hdc, TRANSPARENT);
+    else
+        SetBkMode(hdc, OPAQUE);
+
+    wxColour colBack = GetBackgroundColour();
+
+    if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)
+        colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+
+    ::SetBkColor(hdc, wxColourToRGB(colBack));
+    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+
+    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+
+    return (WXHBRUSH)brush->GetResourceHandle();
+}
+
+// In WIN16, need to override normal erasing because
+// Ctl3D doesn't use the wxWindows background colour.
+#ifdef __WIN16__
+void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
+{
+    wxColour col(m_backgroundColour);
+
+#if wxUSE_CTL3D
+    if (m_useCtl3D)
+        col = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
+#endif
+
+    RECT rect;
+    ::GetClientRect(GetHwnd(), &rect);
+
+    COLORREF ref = PALETTERGB(col.Red(),
+                              col.Green(),
+                              col.Blue());
+    HBRUSH hBrush = ::CreateSolidBrush(ref);
+    if ( !hBrush )
+        wxLogLastError(wxT("CreateSolidBrush"));
+
+    HDC hdc = (HDC)event.GetDC()->GetHDC();
+
+    int mode = ::SetMapMode(hdc, MM_TEXT);
+
+    ::FillRect(hdc, &rect, hBrush);
+    ::DeleteObject(hBrush);
+    ::SetMapMode(hdc, mode);
+
+}
+#endif
+

 void wxTextCtrl::AdjustSpaceLimit()
 {
 #ifndef __WIN16__
 void wxTextCtrl::AdjustSpaceLimit()
 {
 #ifndef __WIN16__


@@ -1009,27 +1085,27 @@ wxSize wxTextCtrl::DoGetBestSize() const
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 

-void wxTextCtrl::OnCut(wxCommandEvent& event)
+void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))

 {
     Cut();
 }
 
 {
     Cut();
 }
 

-void wxTextCtrl::OnCopy(wxCommandEvent& event)
+void wxTextCtrl::OnCopy(wxCommandEvent& WXUNUSED(event))

 {
     Copy();
 }
 
 {
     Copy();
 }
 

-void wxTextCtrl::OnPaste(wxCommandEvent& event)
+void wxTextCtrl::OnPaste(wxCommandEvent& WXUNUSED(event))

 {
     Paste();
 }
 
 {
     Paste();
 }
 

-void wxTextCtrl::OnUndo(wxCommandEvent& event)
+void wxTextCtrl::OnUndo(wxCommandEvent& WXUNUSED(event))

 {
     Undo();
 }
 
 {
     Undo();
 }
 

-void wxTextCtrl::OnRedo(wxCommandEvent& event)
+void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))

 {
     Redo();
 }
 {
     Redo();
 }


@@ -1059,6 +1135,59 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
     event.Enable( CanRedo() );
 }
 

+// ----------------------------------------------------------------------------
+// colour setting for the rich edit controls
+// ----------------------------------------------------------------------------
+
+#if wxUSE_RICHEDIT
+
+// Watcom C++ doesn't define this
+#ifndef SCF_ALL
+#define SCF_ALL 0x0004
+#endif
+
+bool wxTextCtrl::SetBackgroundColour(const wxColour& colour)
+{
+    if ( !wxTextCtrlBase::SetBackgroundColour(colour) )
+    {
+        // colour didn't really change
+        return FALSE;
+    }
+
+    if ( IsRich() )
+    {
+        // rich edit doesn't use WM_CTLCOLOR, hence we need to send
+        // EM_SETBKGNDCOLOR additionally
+        ::SendMessage(GetHwnd(), EM_SETBKGNDCOLOR, 0, wxColourToRGB(colour));
+    }
+
+    return TRUE;
+}
+
+bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
+{
+    if ( !wxTextCtrlBase::SetForegroundColour(colour) )
+    {
+        // colour didn't really change
+        return FALSE;
+    }
+
+    if ( IsRich() )
+    {
+        // change the colour of everything
+        CHARFORMAT cf;
+        wxZeroMemory(cf);
+        cf.cbSize = sizeof(cf);
+        cf.dwMask = CFM_COLOR;
+        cf.crTextColor = wxColourToRGB(colour);
+        ::SendMessage(GetHwnd(), EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);
+    }
+
+    return TRUE;
+}
+
+#endif // wxUSE_RICHEDIT
+

 // ----------------------------------------------------------------------------
 // wxRichEditModule
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxRichEditModule
 // ----------------------------------------------------------------------------