Changeset 1281 for trunk/src/user32/win32dlg.cpp

Timestamp:

Oct 14, 1999, 11:22:43 AM (26 years ago)

Author:

sandervl

Message:

Window creation rewrite + bugfixes. NOT WORKING CORRECTLY YET..

File:

• trunk/src/user32/win32dlg.cpp (modified) (6 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.13 1999-10-13 14:24:26 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.14 1999-10-14 09:22:41 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -169 +169 @@
 
     fIsDialog = TRUE;
-    CreateWindowExA(&cs, classAtom);
-
-    if(!isUnicode) {
-        if(cs.lpszName) FreeAsciiString((LPSTR)cs.lpszName);
-        if(HIWORD(cs.lpszClass)) {
-                FreeAsciiString((LPSTR)cs.lpszClass);
-        }
-    }
-
-    if (!getWindowHandle())
+    Win32DlgProc = dlgProc;
+
+    this->tmpParam       = param;
+    this->tmpDlgTemplate = (LPSTR)dlgTemplate;
+
+    if (CreateWindowExA(&cs, classAtom) == FALSE)
     {
         if (hUserFont) DeleteObject( hUserFont );
         if (hMenu) DestroyMenu( hMenu );
+        SetLastError(ERROR_OUTOFMEMORY); //TODO: Wrong error
         return;
+    }
+    SetLastError(0);
+    return;
+}
+//******************************************************************************
+//******************************************************************************
+Win32Dialog::~Win32Dialog()
+{
+    if (hUserFont) DeleteObject( hUserFont );
+    if (hMenu) DestroyMenu( hMenu );
+}
+//******************************************************************************
+//******************************************************************************
+ULONG Win32Dialog::MsgCreate(HWND hwndFrame, HWND hwndClient)
+{
+ CREATESTRUCTA  *cs = tmpcs;  //pointer to CREATESTRUCT used in CreateWindowExA method
+ LPARAM       param = tmpParam;
+ LPSTR  dlgTemplate = tmpDlgTemplate;
+
+    Win32BaseWindow::MsgCreate(hwndFrame, hwndClient);
+
+    if(!isUnicode) {
+        if(cs->lpszName) FreeAsciiString((LPSTR)cs->lpszName);
+        if(HIWORD(cs->lpszClass)) {
+                FreeAsciiString((LPSTR)cs->lpszClass);
+        }
     }
 
 //TODO:
 //    wndPtr->helpContext = helpId;
-    Win32DlgProc = dlgProc;
 
     if (hUserFont)
@@ -193 +215 @@
 
     /* Create controls */
-    if (createControls(dlgTemplate, hInst))
+    if (createControls(dlgTemplate, hInstance))
     {
         dprintf(("********* DIALOG CONTROLS CREATED ************"));
@@ -199 +221 @@
         hwndFocus = GetNextDlgTabItem( getWindowHandle(), 0, FALSE );
 
-    if (SendMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param ))
+        if (SendMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param))
              SetFocus(hwndFocus);
 
@@ -207 +229 @@
             ::UpdateWindow( getWindowHandle() );
         }
-    SetLastError(0);
+        SetLastError(0);
         dprintf(("********* DIALOG CREATED ************"));
-        return;
+        return TRUE;
     }
     dprintf(("********* DIALOG CREATION FAILED! ************"));
-    DestroyWindow();
-}
-//******************************************************************************
-//******************************************************************************
-Win32Dialog::~Win32Dialog()
-{
-    if (hUserFont) DeleteObject( hUserFont );
-    if (hMenu) DestroyMenu( hMenu );
-
+    return FALSE;
 }
 /***********************************************************************
@@ -1097 +1111 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32Dialog::MsgOS2Create(HWND hwndOS2, ULONG initParam)
-{
-    OS2Hwnd = hwndOS2;
-    return win32wndproc(Win32Hwnd, WM_CREATE, 0, initParam);
-}
-//******************************************************************************
-//******************************************************************************
 LONG Win32Dialog::SetWindowLongA(int index, ULONG value)
 {