SetBackgroundColour() call is now done after the window is created, not before
(in which case ListCtrl_SetBkColor fails because it's called with HWND = 0) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a781a38247
commit
f83528074b
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user