applied patch 411059 (mingw win32 api version check)

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 9ce9195d15e80e15ff02c1461ae7b3601399fec0..5eef575db79bb69f9dfe3905f09d47235f6f5109 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -282,11 +282,9 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
         win->SubclassWin(hWnd);
         win->AdoptAttributesFromHWND();
         win->SetupColours();
-
-        return win;
     }
-    else
-        return NULL;
+
+    return win;
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)