X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d0edc0f7306aac10a75c545f9cace25d3cee83d..923b48fc637dd3aa9ed1d396ceb872cd3bcaabd1:/src/os2/textctrl.cpp

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index f375a38886..9d38365087 100644
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -101,6 +101,7 @@ bool wxTextCtrl::Create(
 {
     HWND                            hParent;
     int                             nTempy;
+
     //
     // Base initialization
     //
@@ -125,6 +126,7 @@ bool wxTextCtrl::Create(
     }
 
     m_windowStyle = lStyle;
+    m_bIsMLE = FALSE;
 
     long                            lSstyle = WS_VISIBLE | WS_TABSTOP;
 
@@ -200,7 +202,7 @@ bool wxTextCtrl::Create(
     //
     // Set font, position, size and initial value
     //
-    wxFont*                          pTextFont = new wxFont( 10
+    wxFont*                          pTextFont = new wxFont( 8
                                                             ,wxMODERN
                                                             ,wxNORMAL
                                                             ,wxNORMAL
@@ -218,8 +220,8 @@ bool wxTextCtrl::Create(
     ::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
            );
@@ -340,7 +342,6 @@ wxString wxTextCtrl::GetValue() const
         if (*zStr == '\r')
             *zStr = '\n';
     }
-    sStr = zStr;
     return sStr;
 } // end of wxTextCtrl::GetValue
 
@@ -1066,15 +1067,6 @@ void wxTextCtrl::OnChar(
     rEvent.Skip();
 } // end of wxTextCtrl::OnChar
 
-void wxTextCtrl::SetFocus()
-{
-    wxTextCtrlBase::SetFocus();
-    if ( !HasFlag(wxTE_MULTILINE) )
-    {
-        SetSelection(-1, -1);
-    }
-} // end of wxTextCtrl::SetFocus
-
 bool wxTextCtrl::OS2Command(
   WXUINT                            uParam
 , WXWORD                            WXUNUSED(vId)