move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

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

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 85de58bd684962f3e40efd43c7658e28031055ef..d315a58b5caf08293ec3da7809e4dac4e9213bf5 100644 (file)
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -18,6 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"

+    #include "wx/scrolwin.h"

     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/utils.h"


@@ -43,6 +44,11 @@
 #   include <fstream>
 #endif
 
 #   include <fstream>
 #endif
 

+#if !defined(MLE_INDEX)
+#define MLE_INDEX  0
+#define MLE_RGB    1
+#endif
+

 
 // ----------------------------------------------------------------------------
 // event tables and other macros
 
 // ----------------------------------------------------------------------------
 // event tables and other macros


@@ -80,6 +86,10 @@ wxTextCtrl::wxTextCtrl()
 {
 }
 
 {
 }
 

+wxTextCtrl::~wxTextCtrl()
+{
+}
+

 bool wxTextCtrl::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
 bool wxTextCtrl::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId


@@ -87,9 +97,7 @@ bool wxTextCtrl::Create(
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -101,17 +109,21 @@ bool wxTextCtrl::Create(
                      ,rPos
                      ,rSize
                      ,lStyle
                      ,rPos
                      ,rSize
                      ,lStyle

-#if wxUSE_VALIDATORS

                      ,rValidator
                      ,rValidator

-#endif

                      ,rsName
                     ))
                      ,rsName
                     ))

-        return FALSE;
+        return false;
+
+    wxPoint                         vPos = rPos; // The OS/2 position
+    SWP                             vSwp;

 
     if (pParent )
 
     if (pParent )

+    {

         pParent->AddChild(this);
         pParent->AddChild(this);

+    }

 
     m_windowStyle = lStyle;
 
     m_windowStyle = lStyle;

+    m_bIsMLE = false;

 
     long                            lSstyle = WS_VISIBLE | WS_TABSTOP;
 
 
     long                            lSstyle = WS_VISIBLE | WS_TABSTOP;
 


@@ -120,8 +132,8 @@ bool wxTextCtrl::Create(
     //
     if ( m_windowStyle & wxTE_MULTILINE )
     {
     //
     if ( m_windowStyle & wxTE_MULTILINE )
     {

-        m_bIsMLE = TRUE;
-        m_windowStyle |= wxTE_PROCESS_ENTER;
+        lSstyle |= MLS_BORDER | MLS_WORDWRAP;
+        m_bIsMLE = true;

 
         if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
             lSstyle |= MLS_VSCROLL;
 
         if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
             lSstyle |= MLS_VSCROLL;


@@ -132,7 +144,7 @@ bool wxTextCtrl::Create(
     }
     else
     {
     }
     else
     {

-        lSstyle |= ES_LEFT;
+        lSstyle |= ES_LEFT | ES_AUTOSCROLL | ES_MARGIN;

 
         if (m_windowStyle & wxHSCROLL)
             lSstyle |=  ES_AUTOSCROLL;
 
         if (m_windowStyle & wxHSCROLL)
             lSstyle |=  ES_AUTOSCROLL;


@@ -141,16 +153,17 @@ bool wxTextCtrl::Create(
         if (m_windowStyle & wxTE_PASSWORD) // hidden input
             lSstyle |= ES_UNREADABLE;
     }
         if (m_windowStyle & wxTE_PASSWORD) // hidden input
             lSstyle |= ES_UNREADABLE;
     }

+

     if (m_bIsMLE)
     {
         m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                            ,WC_MLE                   // Window class
                                            ,(PSZ)rsValue.c_str()     // Initial Text
                                            ,(ULONG)lSstyle           // Style flags
     if (m_bIsMLE)
     {
         m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                            ,WC_MLE                   // Window class
                                            ,(PSZ)rsValue.c_str()     // Initial Text
                                            ,(ULONG)lSstyle           // Style flags

-                                           ,(LONG)rPos.x             // X pos of origin
-                                           ,(LONG)rPos.y             // Y pos of origin
-                                           ,(LONG)rSize.x            // field width
-                                           ,(LONG)rSize.y            // field height
+                                           ,(LONG)0                  // X pos of origin
+                                           ,(LONG)0                  // Y pos of origin
+                                           ,(LONG)0                  // field width
+                                           ,(LONG)0                  // field height

                                            ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
                                            ,HWND_TOP                 // initial z position
                                            ,(ULONG)vId               // Window identifier
                                            ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
                                            ,HWND_TOP                 // initial z position
                                            ,(ULONG)vId               // Window identifier


@@ -164,10 +177,10 @@ bool wxTextCtrl::Create(
                                            ,WC_ENTRYFIELD            // Window class
                                            ,(PSZ)rsValue.c_str()     // Initial Text
                                            ,(ULONG)lSstyle           // Style flags
                                            ,WC_ENTRYFIELD            // Window class
                                            ,(PSZ)rsValue.c_str()     // Initial Text
                                            ,(ULONG)lSstyle           // Style flags

-                                           ,(LONG)rPos.x             // X pos of origin
-                                           ,(LONG)rPos.y             // Y pos of origin
-                                           ,(LONG)rSize.x            // field width
-                                           ,(LONG)rSize.y            // field height
+                                           ,(LONG)0                  // X pos of origin
+                                           ,(LONG)0                  // Y pos of origin
+                                           ,(LONG)0                  // field width
+                                           ,(LONG)0                  // field height

                                            ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
                                            ,HWND_TOP                 // initial z position
                                            ,(ULONG)vId               // Window identifier
                                            ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
                                            ,HWND_TOP                 // initial z position
                                            ,(ULONG)vId               // Window identifier


@@ -178,7 +191,7 @@ bool wxTextCtrl::Create(
 
     if (m_hWnd == 0)
     {
 
     if (m_hWnd == 0)
     {

-        return FALSE;
+        return false;

     }
 
     SubclassWin(GetHWND());
     }
 
     SubclassWin(GetHWND());


@@ -186,27 +199,31 @@ bool wxTextCtrl::Create(
     //
     // Set font, position, size and initial value
     //
     //
     // Set font, position, size and initial value
     //

-    wxFont&                         vFontParent = pParent->GetFont();
-
-    if (vFontParent.Ok())
-    {
-        SetFont(vFontParent);
-    }
-    else
-    {
-        SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
-    }
-    if (!rsValue.IsEmpty())
+    wxFont*                          pTextFont = new wxFont( 8
+                                                            ,wxMODERN
+                                                            ,wxNORMAL
+                                                            ,wxNORMAL
+                                                           );
+    SetFont(*pTextFont);
+    if (!rsValue.empty())

     {
         SetValue(rsValue);
     }
     SetupColours();
     {
         SetValue(rsValue);
     }
     SetupColours();

-    SetSize( rPos.x
-            ,rPos.y
+    //
+    // If X and/or Y are not zero the difference is the compensation value
+    // for margins for OS/2 controls.
+    //
+    ::WinQueryWindowPos(m_hWnd, &vSwp);
+    SetXComp(vSwp.x);
+    SetYComp(vSwp.y);
+    SetSize( vPos.x - GetXComp()
+            ,vPos.y - GetYComp()

             ,rSize.x
             ,rSize.y
            );
             ,rSize.x
             ,rSize.y
            );

-    return TRUE;
+    delete pTextFont;
+    return true;

 } // end of wxTextCtrl::Create
 
 //
 } // end of wxTextCtrl::Create
 
 //


@@ -234,13 +251,73 @@ void wxTextCtrl::AdoptAttributesFromHWND()
     }
 } // end of wxTextCtrl::AdoptAttributesFromHWND
 
     }
 } // end of wxTextCtrl::AdoptAttributesFromHWND
 

+WXDWORD wxTextCtrl::OS2GetStyle(
+  long                              lStyle
+, WXDWORD*                          pdwExstyle
+) const
+{
+    //
+    // Default border for the text controls is the sunken one
+    //
+    if ((lStyle & wxBORDER_MASK) == wxBORDER_DEFAULT )
+    {
+        lStyle |= wxBORDER_SUNKEN;
+    }
+
+    long                            dwStyle = wxControl::OS2GetStyle( lStyle
+                                                                     ,pdwExstyle
+                                                                    );
+
+    dwStyle = WS_VISIBLE | WS_TABSTOP;
+
+    //
+    // Single and multiline edit fields are two different controls in PM
+    //
+    if ( m_windowStyle & wxTE_MULTILINE )
+    {
+        dwStyle |= MLS_BORDER | MLS_WORDWRAP;
+        if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
+            dwStyle |= MLS_VSCROLL;
+        if (m_windowStyle & wxHSCROLL)
+            dwStyle |= MLS_HSCROLL;
+        if (m_windowStyle & wxTE_READONLY)
+            dwStyle |= MLS_READONLY;
+    }
+    else
+    {
+        dwStyle |= ES_LEFT | ES_AUTOSCROLL | ES_MARGIN;
+        if (m_windowStyle & wxHSCROLL)
+            dwStyle |=  ES_AUTOSCROLL;
+        if (m_windowStyle & wxTE_READONLY)
+            dwStyle |= ES_READONLY;
+        if (m_windowStyle & wxTE_PASSWORD) // hidden input
+            dwStyle |= ES_UNREADABLE;
+    }
+    return dwStyle;
+} // end of wxTextCtrl::OS2GetStyle
+
+void wxTextCtrl::SetWindowStyleFlag(
+  long                              lStyle
+)
+{
+    wxControl::SetWindowStyleFlag(lStyle);
+} // end of wxTextCtrl::SetWindowStyleFlag
+

 void wxTextCtrl::SetupColours()
 {
     wxColour                        vBkgndColour;
 
 void wxTextCtrl::SetupColours()
 {
     wxColour                        vBkgndColour;
 

-    vBkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
+    vBkgndColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);

     SetBackgroundColour(vBkgndColour);
     SetForegroundColour(GetParent()->GetForegroundColour());
     SetBackgroundColour(vBkgndColour);
     SetForegroundColour(GetParent()->GetForegroundColour());

+    if (m_bIsMLE)
+    {
+        ::WinSendMsg( GetHwnd()
+                     ,MLM_SETTEXTCOLOR
+                     ,(MPARAM)GetParent()->GetForegroundColour().GetPixel()
+                     ,(MPARAM)MLE_RGB
+                    );
+    }

 } // end of wxTextCtrl::SetupColours
 
 // ----------------------------------------------------------------------------
 } // end of wxTextCtrl::SetupColours
 
 // ----------------------------------------------------------------------------


@@ -262,7 +339,6 @@ wxString wxTextCtrl::GetValue() const
         if (*zStr == '\r')
             *zStr = '\n';
     }
         if (*zStr == '\r')
             *zStr = '\n';
     }

-    sStr = zStr;

     return sStr;
 } // end of wxTextCtrl::GetValue
 
     return sStr;
 } // end of wxTextCtrl::GetValue
 


@@ -287,7 +363,10 @@ void wxTextCtrl::WriteText(
   const wxString&                   rsValue
 )
 {
   const wxString&                   rsValue
 )
 {

-    ::WinSetWindowText(GetHwnd(), rsValue.c_str());
+    if (m_bIsMLE)
+        ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM((PCHAR)rsValue.c_str()), MPARAM(0));
+    else
+        ::WinSetWindowText(GetHwnd(), rsValue.c_str());

     AdjustSpaceLimit();
 } // end of wxTextCtrl::WriteText
 
     AdjustSpaceLimit();
 } // end of wxTextCtrl::WriteText
 


@@ -304,6 +383,14 @@ void wxTextCtrl::Clear()
     ::WinSetWindowText(GetHwnd(), "");
 } // end of wxTextCtrl::Clear
 
     ::WinSetWindowText(GetHwnd(), "");
 } // end of wxTextCtrl::Clear
 

+bool wxTextCtrl::EmulateKeyPress(
+  const wxKeyEvent&                 rEvent
+)
+{
+    SetFocus();
+    return(wxTextCtrlBase::EmulateKeyPress(rEvent));
+} // end of wxTextCtrl::EmulateKeyPress
+

 // ----------------------------------------------------------------------------
 // Clipboard operations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Clipboard operations
 // ----------------------------------------------------------------------------


@@ -369,10 +456,10 @@ bool wxTextCtrl::CanCut() const
 
 bool wxTextCtrl::CanPaste() const
 {
 
 bool wxTextCtrl::CanPaste() const
 {

-    bool                            bIsTextAvailable = FALSE;
+    bool                            bIsTextAvailable = false;

 
     if (!IsEditable())
 
     if (!IsEditable())

-        return FALSE;
+        return false;

 
     //
     // Check for straight text on clipboard
 
     //
     // Check for straight text on clipboard


@@ -415,8 +502,17 @@ void wxTextCtrl::SetInsertionPoint(
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
 
 void wxTextCtrl::SetInsertionPointEnd()
 {

-    long                            lPos = GetLastPosition();
+    wxTextPos                       lPos = GetLastPosition();

 
 

+    //
+    // We must not do anything if the caret is already there because calling
+    // SetInsertionPoint() thaws the controls if Freeze() had been called even
+    // if it doesn't actually move the caret anywhere and so the simple fact of
+    // doing it results in horrible flicker when appending big amounts of text
+    // to the control in a few chunks (see DoAddText() test in the text sample)
+    //
+    if (GetInsertionPoint() == GetLastPosition())
+        return;

     SetInsertionPoint(lPos);
 } // end of wxTextCtrl::SetInsertionPointEnd
 
     SetInsertionPoint(lPos);
 } // end of wxTextCtrl::SetInsertionPointEnd
 


@@ -434,7 +530,7 @@ long wxTextCtrl::GetInsertionPoint() const
     return (dwPos & 0xFFFF);
 } // end of wxTextCtrl::GetInsertionPoint
 
     return (dwPos & 0xFFFF);
 } // end of wxTextCtrl::GetInsertionPoint
 

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

 {
     HWND                            hWnd = GetHwnd();
     long                            lCharIndex;
 {
     HWND                            hWnd = GetHwnd();
     long                            lCharIndex;


@@ -508,8 +604,6 @@ void wxTextCtrl::Replace(
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd      = GetHwnd();
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd      = GetHwnd();

-    long                            lFromChar = lFrom;
-    long                            lToChar   = lTo;

 
     //
     // Set selection and remove it
 
     //
     // Set selection and remove it


@@ -546,8 +640,6 @@ void wxTextCtrl::Remove(
 )
 {
     HWND                            hWnd      = GetHwnd();
 )
 {
     HWND                            hWnd      = GetHwnd();

-    long                            lFromChar = lFrom;
-    long                            lToChar   = lTo;

 
     if (m_bIsMLE)
     {
 
     if (m_bIsMLE)
     {


@@ -571,7 +663,7 @@ void wxTextCtrl::SetSelection(
     long                            lToChar = lTo;
 
     //
     long                            lToChar = lTo;
 
     //

-    // If from and to are both -1, it means (in wxWindows) that all text should
+    // If from and to are both -1, it means (in wxWidgets) that all text should

     // be selected. Translate into Windows convention
     //
     if ((lFrom == -1L) && (lTo == -1L))
     // be selected. Translate into Windows convention
     //
     if ((lFrom == -1L) && (lTo == -1L))


@@ -595,9 +687,9 @@ bool wxTextCtrl::LoadFile(
         // Update the size limit if needed
         //
         AdjustSpaceLimit();
         // Update the size limit if needed
         //
         AdjustSpaceLimit();

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 } // end of wxTextCtrl::LoadFile
 
 bool wxTextCtrl::IsModified() const
 } // end of wxTextCtrl::LoadFile
 
 bool wxTextCtrl::IsModified() const


@@ -611,6 +703,15 @@ bool wxTextCtrl::IsModified() const
     return bRc;
 } // end of wxTextCtrl::IsModified
 
     return bRc;
 } // end of wxTextCtrl::IsModified
 

+void wxTextCtrl::MarkDirty()
+{
+    if (m_bIsMLE)
+        ::WinSendMsg(GetHwnd(), MLM_SETCHANGED, MPFROMLONG(TRUE), 0);
+    else
+        // EM controls do not have a SETCHANGED, what can we do??
+        wxFAIL_MSG( _T("not implemented") );
+}
+

 //
 // Makes 'unmodified'
 //
 //
 // Makes 'unmodified'
 //


@@ -641,7 +742,6 @@ long wxTextCtrl::XYToPosition(
 , long                              lY
 ) const
 {
 , long                              lY
 ) const
 {

-    HWND                            hWnd = GetHwnd();

     long                            lCharIndex = 0L;
     long                            lLen;
 
     long                            lCharIndex = 0L;
     long                            lLen;
 


@@ -673,7 +773,7 @@ bool wxTextCtrl::PositionToXY(
     if (nLineNo == -1)
     {
         // no such line
     if (nLineNo == -1)
     {
         // no such line

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


@@ -705,7 +805,7 @@ bool wxTextCtrl::PositionToXY(
 
     if (lCharIndex == -1)
     {
 
     if (lCharIndex == -1)
     {

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


@@ -716,7 +816,7 @@ bool wxTextCtrl::PositionToXY(
     if (plY)
         *plY = nLineNo;
 
     if (plY)
         *plY = nLineNo;
 

-    return TRUE;
+    return true;

 } // end of wxTextCtrl::PositionToXY
 
 void wxTextCtrl::ShowPosition(
 } // end of wxTextCtrl::PositionToXY
 
 void wxTextCtrl::ShowPosition(


@@ -856,7 +956,7 @@ bool wxTextCtrl::CanUndo() const
     if (m_bIsMLE)
         bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
     else
     if (m_bIsMLE)
         bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
     else

-        bOk = FALSE; // can't undo regular edit fields in PM
+        bOk = false; // can't undo regular edit fields in PM

     return bOk;
 } // end of wxTextCtrl::CanUndo
 
     return bOk;
 } // end of wxTextCtrl::CanUndo
 


@@ -867,7 +967,7 @@ bool wxTextCtrl::CanRedo() const
     if (m_bIsMLE)
         bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
     else
     if (m_bIsMLE)
         bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
     else

-        bOk = FALSE; // can't undo regular edit fields in PM
+        bOk = false; // can't undo regular edit fields in PM

     return bOk;
 } // end of wxTextCtrl::CanRedo
 
     return bOk;
 } // end of wxTextCtrl::CanRedo
 


@@ -904,7 +1004,6 @@ WXHBRUSH wxTextCtrl::OnCtlColor(
 )
 {
     HPS                             hPS = (HPS)hWxDC;
 )
 {
     HPS                             hPS = (HPS)hWxDC;

-    wxBrush*                        pBrush = NULL;

     wxColour                        vColBack = GetBackgroundColour();
     wxColour                        vColFore = GetForegroundColour();
     wxBrush*                        pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()
     wxColour                        vColBack = GetBackgroundColour();
     wxColour                        vColFore = GetForegroundColour();
     wxBrush*                        pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()


@@ -922,17 +1021,24 @@ WXHBRUSH wxTextCtrl::OnCtlColor(
     else
         ::GpiSetBackMix(hPS, BM_OVERPAINT);
     if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)
     else
         ::GpiSetBackMix(hPS, BM_OVERPAINT);
     if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)

-        vColBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        vColBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     ::GpiSetBackColor(hPS, vColBack.GetPixel());
     ::GpiSetColor(hPS, vColFore.GetPixel());
     return (WXHBRUSH)pBackgroundBrush->GetResourceHandle();
 } // end of wxTextCtrl::OnCtlColor
 
     ::GpiSetBackColor(hPS, vColBack.GetPixel());
     ::GpiSetColor(hPS, vColFore.GetPixel());
     return (WXHBRUSH)pBackgroundBrush->GetResourceHandle();
 } // end of wxTextCtrl::OnCtlColor
 

+bool wxTextCtrl::OS2ShouldPreProcessMessage(
+  WXMSG*                            pMsg
+)
+{
+    return wxControl::OS2ShouldPreProcessMessage(pMsg);
+} // end of wxTextCtrl::OS2ShouldPreProcessMessage
+

 void wxTextCtrl::OnChar(
   wxKeyEvent&                       rEvent
 )
 {
 void wxTextCtrl::OnChar(
   wxKeyEvent&                       rEvent
 )
 {

-    switch (rEvent.KeyCode())
+    switch (rEvent.GetKeyCode())

     {
         case WXK_RETURN:
             if ( !(m_windowStyle & wxTE_MULTILINE) )
     {
         case WXK_RETURN:
             if ( !(m_windowStyle & wxTE_MULTILINE) )


@@ -959,7 +1065,7 @@ void wxTextCtrl::OnChar(
                 wxNavigationKeyEvent    vEventNav;
 
                 vEventNav.SetDirection(!rEvent.ShiftDown());
                 wxNavigationKeyEvent    vEventNav;
 
                 vEventNav.SetDirection(!rEvent.ShiftDown());

-                vEventNav.SetWindowChange(FALSE);
+                vEventNav.SetWindowChange(false);

                 vEventNav.SetEventObject(this);
 
                 if ( GetEventHandler()->ProcessEvent(vEventNav) )
                 vEventNav.SetEventObject(this);
 
                 if ( GetEventHandler()->ProcessEvent(vEventNav) )


@@ -997,7 +1103,6 @@ bool wxTextCtrl::OS2Command(
                                           );
 
                 InitCommandEvent(vEvent);
                                           );
 
                 InitCommandEvent(vEvent);

-                vEvent.SetString((char*)GetValue().c_str());

                 ProcessCommand(vEvent);
             }
             break;
                 ProcessCommand(vEvent);
             }
             break;


@@ -1012,15 +1117,15 @@ bool wxTextCtrl::OS2Command(
         case EN_SCROLL:
         case EN_INSERTMODETOGGLE:
         case EN_MEMERROR:
         case EN_SCROLL:
         case EN_INSERTMODETOGGLE:
         case EN_MEMERROR:

-            return FALSE;
+            return false;

         default:
         default:

-            return FALSE;
+            return false;

     }
 
     //
     // Processed
     //
     }
 
     //
     // Processed
     //

-    return TRUE;
+    return true;

 } // end of wxTextCtrl::OS2Command
 
 void wxTextCtrl::AdjustSpaceLimit()
 } // end of wxTextCtrl::OS2Command
 
 void wxTextCtrl::AdjustSpaceLimit()


@@ -1039,10 +1144,11 @@ void wxTextCtrl::AdjustSpaceLimit()
     }
     else
     {
     }
     else
     {

-        ENTRYFDATA*                 pEfd;
+        ENTRYFDATA                  Efd;

         WNDPARAMS                   vParams;
 
         vParams.fsStatus = WPM_CBCTLDATA;
         WNDPARAMS                   vParams;
 
         vParams.fsStatus = WPM_CBCTLDATA;

+        vParams.pCtlData = &Efd;

         vParams.cbCtlData = sizeof(ENTRYFDATA);
 
         if (::WinSendMsg( GetHwnd()
         vParams.cbCtlData = sizeof(ENTRYFDATA);
 
         if (::WinSendMsg( GetHwnd()


@@ -1050,10 +1156,7 @@ void wxTextCtrl::AdjustSpaceLimit()
                          ,&vParams
                          ,0
                         ))
                          ,&vParams
                          ,0
                         ))

-        {
-            pEfd = (ENTRYFDATA*)vParams.pCtlData;
-            uLimit = (unsigned int)pEfd->cchEditLimit;
-        }
+            uLimit = (unsigned int)Efd.cchEditLimit;

         else
             uLimit = 32; //PM's default
     }
         else
             uLimit = 32; //PM's default
     }


@@ -1067,31 +1170,34 @@ void wxTextCtrl::AdjustSpaceLimit()
         if (m_bIsMLE)
             ::WinSendMsg(GetHwnd(), MLM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
         else
         if (m_bIsMLE)
             ::WinSendMsg(GetHwnd(), MLM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
         else

-            ::WinSendMsg(GetHwnd(), EM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
+            ::WinSendMsg(GetHwnd(), EM_SETTEXTLIMIT, MPFROMSHORT(uLimit), 0);

     }
 } // end of wxTextCtrl::AdjustSpaceLimit
 
 bool wxTextCtrl::AcceptsFocus() const
 {
     //
     }
 } // end of wxTextCtrl::AdjustSpaceLimit
 
 bool wxTextCtrl::AcceptsFocus() const
 {
     //

-    // We don't want focus if we can't be edited
+    // We don't want focus if we can't be edited unless we're a multiline
+    // control because then it might be still nice to get focus from keyboard
+    // to be able to scroll it without mouse

     //
     //

-    return IsEditable() && wxControl::AcceptsFocus();
+    return (IsEditable() || IsMultiLine()) && wxControl::AcceptsFocus();

 } // end of wxTextCtrl::Command
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     int                             nCx;
     int                             nCy;
 } // end of wxTextCtrl::Command
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     int                             nCx;
     int                             nCy;

+    wxFont                          vFont = (wxFont)GetFont();

 
 

-    wxGetCharSize(GetHWND(), &nCx, &nCy, (wxFont*)&GetFont());
+    wxGetCharSize(GetHWND(), &nCx, &nCy, &vFont);

 
     int                             wText = DEFAULT_ITEM_WIDTH;
 
     int                             wText = DEFAULT_ITEM_WIDTH;

-    int                             hText = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy);
+    int                             hText = (int)(EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * .8);

 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-        hText *= wxMin(GetNumberOfLines(), 5);
+        hText *= wxMax(GetNumberOfLines(), 5);

     }
     //else: for single line control everything is ok
     return wxSize(wText, hText);
     }
     //else: for single line control everything is ok
     return wxSize(wText, hText);


@@ -1136,6 +1242,29 @@ void wxTextCtrl::OnRedo(
     Redo();
 } // end of wxTextCtrl::OnRedo
 
     Redo();
 } // end of wxTextCtrl::OnRedo
 

+void wxTextCtrl::OnDelete(
+  wxCommandEvent&                   rEvent
+)
+{
+    long                            lFrom;
+    long                            lTo;
+
+    GetSelection( &lFrom
+                 ,&lTo
+                );
+    if (lFrom != -1 && lTo != -1)
+        Remove( lFrom
+               ,lTo
+              );
+} // end of wxTextCtrl::OnDelete
+
+void wxTextCtrl::OnSelectAll(
+  wxCommandEvent&                   rEvent
+)
+{
+    SetSelection(-1, -1);
+} // end of wxTextCtrl::OnSelectAll
+

 void wxTextCtrl::OnUpdateCut(
   wxUpdateUIEvent&                  rEvent
 )
 void wxTextCtrl::OnUpdateCut(
   wxUpdateUIEvent&                  rEvent
 )


@@ -1171,13 +1300,33 @@ void wxTextCtrl::OnUpdateRedo(
     rEvent.Enable(CanRedo());
 } // end of wxTextCtrl::OnUpdateRedo
 
     rEvent.Enable(CanRedo());
 } // end of wxTextCtrl::OnUpdateRedo
 

+void wxTextCtrl::OnUpdateDelete(
+  wxUpdateUIEvent&                  rEvent
+)
+{
+    long                            lFrom;
+    long                            lTo;
+
+    GetSelection( &lFrom
+                 ,&lTo
+                );
+    rEvent.Enable( lFrom != -1L && lTo != -1L && lFrom != lTo && IsEditable()) ;
+} // end of wxTextCtrl::OnUpdateDelete
+
+void wxTextCtrl::OnUpdateSelectAll(
+  wxUpdateUIEvent&                  rEvent
+)
+{
+    rEvent.Enable(GetLastPosition() > 0);
+} // end of wxTextCtrl::OnUpdateSelectAll
+

 bool wxTextCtrl::SetBackgroundColour(
   const wxColour&                   rColour
 )
 {
     if (m_bIsMLE)
         ::WinSendMsg(GetHwnd(), MLM_SETBACKCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
 bool wxTextCtrl::SetBackgroundColour(
   const wxColour&                   rColour
 )
 {
     if (m_bIsMLE)
         ::WinSendMsg(GetHwnd(), MLM_SETBACKCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);

-    return TRUE;
+    return true;

 } // end of wxTextCtrl::SetBackgroundColour
 
 bool wxTextCtrl::SetForegroundColour(
 } // end of wxTextCtrl::SetBackgroundColour
 
 bool wxTextCtrl::SetForegroundColour(


@@ -1186,6 +1335,53 @@ bool wxTextCtrl::SetForegroundColour(
 {
     if (m_bIsMLE)
         ::WinSendMsg(GetHwnd(), MLM_SETTEXTCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
 {
     if (m_bIsMLE)
         ::WinSendMsg(GetHwnd(), MLM_SETTEXTCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);

-    return TRUE;
+    return true;

 } // end of wxTextCtrl::SetForegroundColour
 
 } // end of wxTextCtrl::SetForegroundColour
 

+bool wxTextCtrl::SetStyle(
+  long                              lStart
+, long                              lEnd
+, const wxTextAttr&                 rStyle
+)
+{
+    HWND                            hWnd = GetHwnd();
+
+    if (lStart > lEnd)
+    {
+        long                        lTmp = lStart;
+
+        lStart = lEnd;
+        lEnd   = lTmp;
+    }
+
+    //
+    // We can only change the format of the selection, so select the range we
+    // want and restore the old selection later
+    //
+    long                            lStartOld;
+    long                            lEndOld;
+
+    GetSelection( &lStartOld
+                 ,&lEndOld
+                );
+
+    //
+    // But do we really have to change the selection?
+    //
+    bool                            bChangeSel = lStart != lStartOld ||
+                                                 lEnd != lEndOld;
+
+    if (bChangeSel)
+    {
+        if (m_bIsMLE)
+            ::WinSendMsg(hWnd, MLM_SETSEL, MPFROM2SHORT((USHORT)lStart, (USHORT)lEnd), 0);
+        else
+            ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lStart, (USHORT)lEnd), 0);
+    }
+
+    //
+    // TODO:: finish this part
+    //
+    return true;
+} // end of wxTextCtrl::SetStyle
+