added correct coordinate handling

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 2862f2477575d521de8928f561e06b68eeb18a17..8f0b1544b9510d421a37424b31b879b09cf7d47c 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -27,6 +27,7 @@
 #if defined(__WIN95__)
 
 #include "wx/listctrl.h"
 #if defined(__WIN95__)
 
 #include "wx/listctrl.h"

+#include "wx/log.h"

 
 #include "wx/msw/private.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;
 
   m_textCtrl = NULL;
   m_colCount = 0;
 

-  wxSystemSettings settings;
-  SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
-  SetForegroundColour(parent->GetDefaultForegroundColour());
-

   SetValidator(validator);
   SetName(name);
 
   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.
   wstyle |= ConvertToMSWStyle(oldStyle, m_windowStyle);
 
   // Create the ListView control.

-  HWND hWndListControl = CreateWindowEx(exStyle,
+  m_hWnd = (WXHWND)CreateWindowEx(exStyle,

     WC_LISTVIEW,
     "",
     wstyle,
     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(),
     (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);
   if (parent) parent->AddChild(this);
   
   SubclassWin((WXHWND) m_hWnd);