X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45bfc84b20112373b5ee5fd5a910c96b342e6e71..2adaf5969faf352d740f267b1a4ef79a2cf75980:/src/os2/textctrl.cpp diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp index c216abe9a6..1895e9657b 100644 --- a/src/os2/textctrl.cpp +++ b/src/os2/textctrl.cpp @@ -43,6 +43,11 @@ # include #endif +#if defined(__EMX__) && !defined(MLE_INDEX) +#define MLE_INDEX 0 +#define MLE_RGB 1 +#endif + // ---------------------------------------------------------------------------- // event tables and other macros @@ -116,14 +121,14 @@ bool wxTextCtrl::Create( // // OS2 uses normal coordinates, no bassackwards Windows ones // - vPos.y = pParent->GetSize().y - (vPos.y + rSize.y); +// vPos.y = pParent->GetSize().y - (vPos.y + rSize.y); } else { RECTL vRect; ::WinQueryWindowRect(HWND_DESKTOP, &vRect); - vPos.y = vRect.yTop - (vPos.y + rSize.y); +// vPos.y = vRect.yTop - (vPos.y + rSize.y); } m_windowStyle = lStyle; @@ -162,10 +167,10 @@ bool wxTextCtrl::Create( ,WC_MLE // Window class ,(PSZ)rsValue.c_str() // Initial Text ,(ULONG)lSstyle // Style flags - ,(LONG)vPos.x // X pos of origin - ,(LONG)vPos.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 @@ -179,10 +184,10 @@ bool wxTextCtrl::Create( ,WC_ENTRYFIELD // Window class ,(PSZ)rsValue.c_str() // Initial Text ,(ULONG)lSstyle // Style flags - ,(LONG)vPos.x // X pos of origin - ,(LONG)vPos.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