xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index ed6efcdd49829699b3212819875dde91fdd4e461..9c8c53505cb4a62ab78781064cac64ba4fceade6 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation
 #endif
 
@@ -74,15 +74,14 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
     HWND hWndNext;
     hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
 
-    wxWindow* child = NULL;
     if (hWndNext)
-        child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+        CreateWindowFromHWND(this, (WXHWND) hWndNext);
 
     while (hWndNext != (HWND) NULL)
     {
         hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
         if (hWndNext)
-            child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+            CreateWindowFromHWND(this, (WXHWND) hWndNext);
     }
 
     return TRUE;
@@ -112,15 +111,14 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
     HWND hWndNext;
     hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
 
-    wxWindow* child = NULL;
     if (hWndNext)
-        child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+        CreateWindowFromHWND(this, (WXHWND) hWndNext);
 
     while (hWndNext != (HWND) NULL)
     {
         hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
         if (hWndNext)
-            child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+            CreateWindowFromHWND(this, (WXHWND) hWndNext);
     }
 
     return TRUE;