X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/os2/textctrl.cpp?ds=sidebyside

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 504758dee8..f02d4af9db 100644
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
@@ -112,7 +112,7 @@ bool wxTextCtrl::Create(
                      ,rValidator
                      ,rsName
                     ))
-        return FALSE;
+        return false;
 
     wxPoint                         vPos = rPos; // The OS/2 position
     SWP                             vSwp;
@@ -123,7 +123,7 @@ bool wxTextCtrl::Create(
     }
 
     m_windowStyle = lStyle;
-    m_bIsMLE = FALSE;
+    m_bIsMLE = false;
 
     long                            lSstyle = WS_VISIBLE | WS_TABSTOP;
 
@@ -133,7 +133,7 @@ bool wxTextCtrl::Create(
     if ( m_windowStyle & wxTE_MULTILINE )
     {
         lSstyle |= MLS_BORDER | MLS_WORDWRAP;
-        m_bIsMLE = TRUE;
+        m_bIsMLE = true;
 
         if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
             lSstyle |= MLS_VSCROLL;
@@ -191,7 +191,7 @@ bool wxTextCtrl::Create(
 
     if (m_hWnd == 0)
     {
-        return FALSE;
+        return false;
     }
 
     SubclassWin(GetHWND());
@@ -205,7 +205,7 @@ bool wxTextCtrl::Create(
                                                             ,wxNORMAL
                                                            );
     SetFont(*pTextFont);
-    if (!rsValue.IsEmpty())
+    if (!rsValue.empty())
     {
         SetValue(rsValue);
     }
@@ -223,7 +223,7 @@ bool wxTextCtrl::Create(
             ,rSize.y
            );
     delete pTextFont;
-    return TRUE;
+    return true;
 } // end of wxTextCtrl::Create
 
 //
@@ -354,7 +354,7 @@ void wxTextCtrl::SetValue(
     //
     if ((rsValue.length() > 0x400) || (rsValue != GetValue()))
     {
-        ::WinSetWindowText(GetHwnd(), rsValue.c_str());
+        ::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str());
         AdjustSpaceLimit();
     }
 } // end of wxTextCtrl::SetValue
@@ -366,7 +366,7 @@ void wxTextCtrl::WriteText(
     if (m_bIsMLE)
         ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM((PCHAR)rsValue.c_str()), MPARAM(0));
     else
-        ::WinSetWindowText(GetHwnd(), rsValue.c_str());
+        ::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str());
     AdjustSpaceLimit();
 } // end of wxTextCtrl::WriteText
 
@@ -456,10 +456,10 @@ bool wxTextCtrl::CanCut() const
 
 bool wxTextCtrl::CanPaste() const
 {
-    bool                            bIsTextAvailable = FALSE;
+    bool                            bIsTextAvailable = false;
 
     if (!IsEditable())
-        return FALSE;
+        return false;
 
     //
     // Check for straight text on clipboard
@@ -502,7 +502,7 @@ void wxTextCtrl::SetInsertionPoint(
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
-    long                            lPos = GetLastPosition();
+    wxTextPos                       lPos = GetLastPosition();
 
     //
     // We must not do anything if the caret is already there because calling
@@ -530,7 +530,7 @@ long wxTextCtrl::GetInsertionPoint() const
     return (dwPos & 0xFFFF);
 } // end of wxTextCtrl::GetInsertionPoint
 
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
 {
     HWND                            hWnd = GetHwnd();
     long                            lCharIndex;
@@ -687,9 +687,9 @@ bool wxTextCtrl::LoadFile(
         // Update the size limit if needed
         //
         AdjustSpaceLimit();
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 } // end of wxTextCtrl::LoadFile
 
 bool wxTextCtrl::IsModified() const
@@ -773,7 +773,7 @@ bool wxTextCtrl::PositionToXY(
     if (nLineNo == -1)
     {
         // no such line
-        return FALSE;
+        return false;
     }
 
     //
@@ -805,7 +805,7 @@ bool wxTextCtrl::PositionToXY(
 
     if (lCharIndex == -1)
     {
-        return FALSE;
+        return false;
     }
 
     //
@@ -816,7 +816,7 @@ bool wxTextCtrl::PositionToXY(
     if (plY)
         *plY = nLineNo;
 
-    return TRUE;
+    return true;
 } // end of wxTextCtrl::PositionToXY
 
 void wxTextCtrl::ShowPosition(
@@ -884,14 +884,14 @@ wxString wxTextCtrl::GetLineText(
 {
     long                            lLen = (long)GetLineLength((long)lLineNo) + 1;
     wxString                        sStr;
-    char*                           zBuf;
+    wxChar*                         zBuf;
 
     //
     // There must be at least enough place for the length WORD in the
     // buffer
     //
     lLen += sizeof(WORD);
-    zBuf = new char[lLen];
+    zBuf = new wxChar[lLen];
     if (m_bIsMLE)
     {
         long                        lIndex;
@@ -902,7 +902,7 @@ wxString wxTextCtrl::GetLineText(
         lIndex = lLen * lLineNo;
 
         ::WinSendMsg(GetHwnd(), MLM_SETSEL, (MPARAM)lIndex, (MPARAM)lIndex);
-        ::WinSendMsg(GetHwnd(), MLM_SETIMPORTEXPORT, MPFROMP(zBuf), MPFROMSHORT((USHORT)sizeof(zBuf)));
+        ::WinSendMsg(GetHwnd(), MLM_SETIMPORTEXPORT, MPFROMP(zBuf), MPFROMSHORT((USHORT)WXSIZEOF(zBuf)));
         lBuflen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYFORMATTEXTLENGTH, MPFROMLONG(lIndex), MPFROMLONG(-1));
         lCopied = (long)::WinSendMsg(GetHwnd(), MLM_EXPORT, MPFROMP(&lIndex), MPFROMP(&lBuflen));
         zBuf[lCopied] = '\0';
@@ -917,7 +917,7 @@ wxString wxTextCtrl::GetLineText(
                          ,&vParams
                          ,0
                         ))
-         memcpy(zBuf, vParams.pszText, vParams.cchText);
+         memcpy((char*)zBuf, vParams.pszText, vParams.cchText);
          zBuf[vParams.cchText] = '\0';
      }
      sStr = zBuf;
@@ -956,7 +956,7 @@ bool wxTextCtrl::CanUndo() const
     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
 
@@ -967,7 +967,7 @@ bool wxTextCtrl::CanRedo() const
     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
 
@@ -1065,7 +1065,7 @@ void wxTextCtrl::OnChar(
                 wxNavigationKeyEvent    vEventNav;
 
                 vEventNav.SetDirection(!rEvent.ShiftDown());
-                vEventNav.SetWindowChange(FALSE);
+                vEventNav.SetWindowChange(false);
                 vEventNav.SetEventObject(this);
 
                 if ( GetEventHandler()->ProcessEvent(vEventNav) )
@@ -1103,7 +1103,6 @@ bool wxTextCtrl::OS2Command(
                                           );
 
                 InitCommandEvent(vEvent);
-                vEvent.SetString((char*)GetValue().c_str());
                 ProcessCommand(vEvent);
             }
             break;
@@ -1118,15 +1117,15 @@ bool wxTextCtrl::OS2Command(
         case EN_SCROLL:
         case EN_INSERTMODETOGGLE:
         case EN_MEMERROR:
-            return FALSE;
+            return false;
         default:
-            return FALSE;
+            return false;
     }
 
     //
     // Processed
     //
-    return TRUE;
+    return true;
 } // end of wxTextCtrl::OS2Command
 
 void wxTextCtrl::AdjustSpaceLimit()
@@ -1149,7 +1148,7 @@ void wxTextCtrl::AdjustSpaceLimit()
         WNDPARAMS                   vParams;
 
         vParams.fsStatus = WPM_CBCTLDATA;
-	vParams.pCtlData = &Efd;
+        vParams.pCtlData = &Efd;
         vParams.cbCtlData = sizeof(ENTRYFDATA);
 
         if (::WinSendMsg( GetHwnd()
@@ -1189,8 +1188,9 @@ 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                             hText = (int)(EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * .8);
@@ -1326,7 +1326,7 @@ bool wxTextCtrl::SetBackgroundColour(
 {
     if (m_bIsMLE)
         ::WinSendMsg(GetHwnd(), MLM_SETBACKCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
-    return TRUE;
+    return true;
 } // end of wxTextCtrl::SetBackgroundColour
 
 bool wxTextCtrl::SetForegroundColour(
@@ -1335,7 +1335,7 @@ bool wxTextCtrl::SetForegroundColour(
 {
     if (m_bIsMLE)
         ::WinSendMsg(GetHwnd(), MLM_SETTEXTCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
-    return TRUE;
+    return true;
 } // end of wxTextCtrl::SetForegroundColour
 
 bool wxTextCtrl::SetStyle(
@@ -1382,6 +1382,6 @@ bool wxTextCtrl::SetStyle(
     //
     // TODO:: finish this part
     //
-    return TRUE;
+    return true;
 } // end of wxTextCtrl::SetStyle