delay setting the window shape until it is realized (slightly modified patch 1935497)

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

diff --git a/src/os2/nativdlg.cpp b/src/os2/nativdlg.cpp
index 0a0275de35a73833def6b5ae5ea03b44b4effb92..16c829462076a7a019465b65ed7d903b2d337e09 100644 (file)
--- a/src/os2/nativdlg.cpp
+++ b/src/os2/nativdlg.cpp
@@ -33,11 +33,11 @@
 // ---------------------------------------------------------------------------
 
 extern wxWindow* wxWndHook;
 // ---------------------------------------------------------------------------
 
 extern wxWindow* wxWndHook;

-extern MRESULT wxDlgProc( HWND   hWnd
-                         ,UINT   message
-                         ,MPARAM wParam
-                         ,MPARAM lParam
-                        );
+extern MRESULT EXPENTRY wxDlgProc( HWND   hWnd
+                                  ,UINT   message
+                                  ,MPARAM wParam
+                                  ,MPARAM lParam
+                                 );

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -137,17 +137,17 @@ wxWindow* wxWindow::GetWindowChild1 (
     if (m_windowId == vId)
         return this;
 
     if (m_windowId == vId)
         return this;
 

-    wxWindowList::Node*             pNode = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

 
 

-    while (pNode)
+    while (node)

     {
     {

-        wxWindow*                   pChild = pNode->GetData();
+        wxWindow*                   pChild = node->GetData();

         wxWindow*                   pWin   = pChild->GetWindowChild1(vId);
 
         if (pWin)
             return pWin;
 
         wxWindow*                   pWin   = pChild->GetWindowChild1(vId);
 
         if (pWin)
             return pWin;
 

-        pNode = pNode->GetNext();
+        node = node->GetNext();

     }
     return NULL;
 } // end of wxWindow::GetWindowChild1
     }
     return NULL;
 } // end of wxWindow::GetWindowChild1