Correctly restore the originally used C locale in wxLocale dtor.

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

diff --git a/src/os2/nativdlg.cpp b/src/os2/nativdlg.cpp
index fc6cb380f73b4713eff0aca5522603de0c05d907..3c917fffe9068b1c31294336344fe7f5a24edca1 100644 (file)
--- a/src/os2/nativdlg.cpp
+++ b/src/os2/nativdlg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        nativdlg.cpp
+// Name:        src/os2/nativdlg.cpp

 // Purpose:     Native dialog loading code (part of wxWindow)
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     Native dialog loading code (part of wxWindow)
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -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