Moved some items to 'already done' in the todo list

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 01e0e83c3001574083b07151da96a046c0c7dc0c..5120d55fa2c65eb3b04ce9ca3fcfbd3786852a4a 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -84,6 +84,10 @@
     #define GET_Y_LPARAM(mp) ((unsigned short)(unsigned long)(mp >> 16))
 #endif // GET_X_LPARAM
 
     #define GET_Y_LPARAM(mp) ((unsigned short)(unsigned long)(mp >> 16))
 #endif // GET_X_LPARAM
 

+#ifndef CW_USEDEFAULT
+#  define CW_USEDEFAULT    ((int)0x80000000)
+#endif
+

 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------


@@ -2323,6 +2327,8 @@ bool wxWindow::OS2Create(
 , WXDWORD                           dwExtendedStyle // Port compatability only
 )
 {
 , WXDWORD                           dwExtendedStyle // Port compatability only
 )
 {

+    ERRORID                         vError;
+    wxString                        sError;

     int                             nX1      = CW_USEDEFAULT;
     int                             nY1      = 0;
     int                             nWidth1  = CW_USEDEFAULT;
     int                             nX1      = CW_USEDEFAULT;
     int                             nY1      = 0;
     int                             nWidth1  = CW_USEDEFAULT;


@@ -2346,6 +2352,8 @@ bool wxWindow::OS2Create(
         nWidth1  = vParentRect.xRight - vParentRect.xLeft;
         nHeight1 = vParentRect.yTop - vParentRect.yBottom;
     }
         nWidth1  = vParentRect.xRight - vParentRect.xLeft;
         nHeight1 = vParentRect.yTop - vParentRect.yBottom;
     }

+    else
+        hParent = HWND_DESKTOP;

 
     if (nX > -1)
         nX1 = nX;
 
     if (nX > -1)
         nX1 = nX;


@@ -2369,7 +2377,7 @@ bool wxWindow::OS2Create(
         PDLGTEMPLATE                 pDlgt;
 
         ::DosGetResource(0L, RT_DIALOG, vId, (PPVOID)&pDlgt);
         PDLGTEMPLATE                 pDlgt;
 
         ::DosGetResource(0L, RT_DIALOG, vId, (PPVOID)&pDlgt);

-        m_hWnd = (WXHWND)::WinCreateDlg( pParent->GetHWND()
+        m_hWnd = (WXHWND)::WinCreateDlg( hParent

                                         ,NULLHANDLE
                                         ,(PFNWP)wxDlgProc
                                         ,pDlgt
                                         ,NULLHANDLE
                                         ,(PFNWP)wxDlgProc
                                         ,pDlgt


@@ -2377,8 +2385,11 @@ bool wxWindow::OS2Create(
                                        );
         if (m_hWnd == 0)
         {
                                        );
         if (m_hWnd == 0)
         {

-            wxLogError(_("Can't find dummy dialog template!\n"
-                         "Check resource include path for finding wx.rc."));
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+            wxLogError("Can't find dummy dialog template!\n"
+                       "Check resource include path for finding wx.rc.\n"
+                       "Error: %s\n", sError);

             return FALSE;
         }
 
             return FALSE;
         }
 


@@ -2394,7 +2405,9 @@ bool wxWindow::OS2Create(
                                ,SWP_MOVE | SWP_SIZE | SWP_NOREDRAW
                               ));
         {
                                ,SWP_MOVE | SWP_SIZE | SWP_NOREDRAW
                               ));
         {

-            wxLogLastError(wxT("MoveWindow"));
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+            wxLogError("MoveWindow, error: %s\n", sError);

         }
     }
     else
         }
     }
     else


@@ -2443,7 +2456,9 @@ bool wxWindow::OS2Create(
                                           );
         if (!m_hWnd)
         {
                                           );
         if (!m_hWnd)
         {

-            wxLogError("Can't create window of class %s!\n", zWclass);
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+            wxLogError("Can't create window of class %s!. Error: %s\n", zWclass, sError);

             return FALSE;
         }
     }
             return FALSE;
         }
     }