fixed gcc pragmas in fs_*.h,cpp

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

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 85de58bd684962f3e40efd43c7658e28031055ef..d49c34d97589870df878cc60be459de3fbd32035 100644 (file)
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -43,6 +43,11 @@
 #   include <fstream>
 #endif
 
 #   include <fstream>
 #endif
 

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

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


@@ -108,8 +113,23 @@ bool wxTextCtrl::Create(
                     ))
         return FALSE;
 
                     ))
         return FALSE;
 

+    wxPoint                         vPos = rPos; // The OS/2 position
+

     if (pParent )
     if (pParent )

+    {

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

+        //
+        // OS2 uses normal coordinates, no bassackwards Windows ones
+        //
+        vPos.y = pParent->GetSize().y - (vPos.y + rSize.y);
+    }
+    else
+    {
+        RECTL                   vRect;
+
+        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+        vPos.y = vRect.yTop - (vPos.y + rSize.y);
+    }

 
     m_windowStyle = lStyle;
 
 
     m_windowStyle = lStyle;
 


@@ -147,8 +167,8 @@ bool wxTextCtrl::Create(
                                            ,WC_MLE                   // Window class
                                            ,(PSZ)rsValue.c_str()     // Initial Text
                                            ,(ULONG)lSstyle           // Style flags
                                            ,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)vPos.x             // X pos of origin
+                                           ,(LONG)vPos.y             // Y pos of origin

                                            ,(LONG)rSize.x            // field width
                                            ,(LONG)rSize.y            // field height
                                            ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
                                            ,(LONG)rSize.x            // field width
                                            ,(LONG)rSize.y            // field height
                                            ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent


@@ -164,8 +184,8 @@ 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)vPos.x             // X pos of origin
+                                           ,(LONG)vPos.y             // Y pos of origin

                                            ,(LONG)rSize.x            // field width
                                            ,(LONG)rSize.y            // field height
                                            ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
                                            ,(LONG)rSize.x            // field width
                                            ,(LONG)rSize.y            // field height
                                            ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent