first attempt for full screen implementation

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

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 3949c8f7872e9cd48c3713876b1cc80d27008af8..e4b53da39162d309ad0a3cba656860a01971d634 100644 (file)
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -86,6 +86,10 @@ wxTextCtrl::wxTextCtrl()
 {
 }
 
 {
 }
 

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

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


@@ -93,14 +97,10 @@ 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
 )
 {

-    HWND                            hParent;
-    int                             nTempy;

     //
     // Base initialization
     //
     //
     // Base initialization
     //


@@ -109,9 +109,7 @@ bool wxTextCtrl::Create(
                      ,rPos
                      ,rSize
                      ,lStyle
                      ,rPos
                      ,rSize
                      ,lStyle

-#if wxUSE_VALIDATORS

                      ,rValidator
                      ,rValidator

-#endif

                      ,rsName
                     ))
         return FALSE;
                      ,rsName
                     ))
         return FALSE;


@@ -125,6 +123,7 @@ bool wxTextCtrl::Create(
     }
 
     m_windowStyle = lStyle;
     }
 
     m_windowStyle = lStyle;

+    m_bIsMLE = FALSE;

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


@@ -200,7 +199,7 @@ bool wxTextCtrl::Create(
     //
     // Set font, position, size and initial value
     //
     //
     // Set font, position, size and initial value
     //

-    wxFont*                          pTextFont = new wxFont( 10
+    wxFont*                          pTextFont = new wxFont( 8

                                                             ,wxMODERN
                                                             ,wxNORMAL
                                                             ,wxNORMAL
                                                             ,wxMODERN
                                                             ,wxNORMAL
                                                             ,wxNORMAL


@@ -218,8 +217,8 @@ bool wxTextCtrl::Create(
     ::WinQueryWindowPos(m_hWnd, &vSwp);
     SetXComp(vSwp.x);
     SetYComp(vSwp.y);
     ::WinQueryWindowPos(m_hWnd, &vSwp);
     SetXComp(vSwp.x);
     SetYComp(vSwp.y);

-    SetSize( vPos.x
-            ,vPos.y
+    SetSize( vPos.x - GetXComp()
+            ,vPos.y - GetYComp()

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


@@ -505,6 +504,15 @@ void wxTextCtrl::SetInsertionPointEnd()
 {
     long                            lPos = GetLastPosition();
 
 {
     long                            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
 


@@ -596,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


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

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

 
     if (m_bIsMLE)
     {
 
     if (m_bIsMLE)
     {


@@ -659,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))


@@ -699,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'
 //


@@ -729,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;
 


@@ -992,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()


@@ -1027,7 +1038,7 @@ void wxTextCtrl::OnChar(
   wxKeyEvent&                       rEvent
 )
 {
   wxKeyEvent&                       rEvent
 )
 {

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

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


@@ -1134,10 +1145,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()


@@ -1145,10 +1157,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
     }


@@ -1162,16 +1171,18 @@ 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
 } // end of wxTextCtrl::Command
 
 wxSize wxTextCtrl::DoGetBestSize() const


@@ -1182,7 +1193,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
     wxGetCharSize(GetHWND(), &nCx, &nCy, (wxFont*)&GetFont());
 
     int                             wText = DEFAULT_ITEM_WIDTH;
     wxGetCharSize(GetHWND(), &nCx, &nCy, (wxFont*)&GetFont());
 
     int                             wText = DEFAULT_ITEM_WIDTH;

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

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


@@ -1231,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
 )


@@ -1266,6 +1300,26 @@ 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
 )
 bool wxTextCtrl::SetBackgroundColour(
   const wxColour&                   rColour
 )