resource stack structure that sets up correct resource, new entry points for shared...

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

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index ced8e43b349d336ac0013ffbe76246ecf33c5e55..7596ef7dccac1f32e42f4b80ee4b7d44ab660eaa 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -52,8 +52,9 @@
 wxWindowList wxModelessWindows;
 
 // the name of the default wxWindows class
 wxWindowList wxModelessWindows;
 
 // the name of the default wxWindows class

-extern const wxChar* wxCanvasClassName;
-extern const wxChar* wxFrameClassName;
+extern void          wxAssociateWinWithHandle( HWND         hWnd
+                                              ,wxWindowOS2* pWin
+                                             );

 
 // ============================================================================
 // wxTopLevelWindowMSW implementation
 
 // ============================================================================
 // wxTopLevelWindowMSW implementation


@@ -196,15 +197,15 @@ bool wxTopLevelWindowOS2::CreateDialog(
     }
 
     HWND                            hWndDlg;
     }
 
     HWND                            hWndDlg;

-    HWND                            hWndParent;
+    HWND                            hWndOwner;

 
     if (pParent)
 
     if (pParent)

-        hWndParent = GetHwndOf(pParent);
+        hWndOwner = GetHwndOf(pParent);

     else
     else

-        hWndParent = HWND_DESKTOP;
+        hWndOwner = HWND_DESKTOP;

 
 

-    hWndDlg = ::WinLoadDlg( hWndParent
-                           ,hWndParent
+    hWndDlg = ::WinLoadDlg( HWND_DESKTOP
+                           ,hWndOwner

                            ,(PFNWP)wxDlgProc
                            ,NULL
                            ,(ULONG)ulDlgTemplate
                            ,(PFNWP)wxDlgProc
                            ,NULL
                            ,(ULONG)ulDlgTemplate


@@ -529,6 +530,15 @@ void wxTopLevelWindowOS2::AlterChildPos()
     ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient);
 } // end of wxTopLevelWindowOS2::AlterChildPos
 
     ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient);
 } // end of wxTopLevelWindowOS2::AlterChildPos
 

+void wxTopLevelWindowOS2::UpdateInternalSize(
+  wxWindow*                         pChild
+, int                               nHeight
+)
+{
+    pChild->MoveChildren(m_vSwpClient.cy - nHeight);
+    ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient);
+} // end of wxTopLevelWindowOS2::UpdateInternalSize
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowOS2 client size
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowOS2 client size
 // ----------------------------------------------------------------------------