no message

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 9442a07c038317f209751ab100de30e2b2b971cb..6a0e5dec10851cf425fae54f9de52fa3e69fcf0f 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -97,8 +97,7 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.

-  if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
+  if ( want3D || wxStyleHasBorder(m_windowStyle) )

     wstyle |= WS_BORDER;
 
   wstyle |= LVS_SHAREIMAGELISTS;
     wstyle |= WS_BORDER;
 
   wstyle |= LVS_SHAREIMAGELISTS;


@@ -126,7 +125,7 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
 
   wxSystemSettings settings;
   SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
 
   wxSystemSettings settings;
   SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));

-  SetForegroundColour(parent->GetDefaultForegroundColour());
+  SetForegroundColour(parent->GetForegroundColour());

 
   if (parent) parent->AddChild(this);
   
 
   if (parent) parent->AddChild(this);
   


@@ -857,7 +856,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 // End label editing, optionally cancelling the edit
 bool wxListCtrl::EndEditLabel(bool cancel)
 {
 // End label editing, optionally cancelling the edit
 bool wxListCtrl::EndEditLabel(bool cancel)
 {

-    wxASSERT( FALSE);
+    wxFAIL;

 
 /* I don't know how to implement this: there's no such macro as ListView_EndEditLabelNow.
  * ???
 
 /* I don't know how to implement this: there's no such macro as ListView_EndEditLabelNow.
  * ???