X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..11bc0805dec30cdc07c17cc13d075520efd4e17a:/src/msw/listctrl.cpp

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 2862f24775..8f0b1544b9 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -27,6 +27,7 @@
 #if defined(__WIN95__)
 
 #include "wx/listctrl.h"
+#include "wx/log.h"
 
 #include "wx/msw/private.h"
 
@@ -66,10 +67,6 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
   m_textCtrl = NULL;
   m_colCount = 0;
 
-  wxSystemSettings settings;
-  SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
-  SetForegroundColour(parent->GetDefaultForegroundColour());
-
   SetValidator(validator);
   SetName(name);
 
@@ -111,7 +108,7 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
   wstyle |= ConvertToMSWStyle(oldStyle, m_windowStyle);
 
   // Create the ListView control.
-  HWND hWndListControl = CreateWindowEx(exStyle,
+  m_hWnd = (WXHWND)CreateWindowEx(exStyle,
     WC_LISTVIEW,
     "",
     wstyle,
@@ -119,9 +116,18 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
     (HWND) parent->GetHWND(),
     (HMENU)m_windowId,
     wxGetInstance(),
-    NULL );
+    NULL);
+
+  if ( !m_hWnd ) {
+     wxLogError("Can't create list control window.");
+
+     return FALSE;
+  }
+
+  wxSystemSettings settings;
+  SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
+  SetForegroundColour(parent->GetDefaultForegroundColour());
 
-  m_hWnd = (WXHWND) hWndListControl;
   if (parent) parent->AddChild(this);
   
   SubclassWin((WXHWND) m_hWnd);