pointer returned by GetNativeFontInfo() is now const and must not be deleted (replace...

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 8338025dba4e8413ffe750d2dc18fbd96fa3d291..6060cff9e350d45592ae7569ffe7f5738b3f6f8a 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -232,14 +232,14 @@ wxBEGIN_FLAGS( wxListCtrlStyle )
     wxFLAGS_MEMBER(wxDOUBLE_BORDER)
     wxFLAGS_MEMBER(wxRAISED_BORDER)
     wxFLAGS_MEMBER(wxSTATIC_BORDER)
     wxFLAGS_MEMBER(wxDOUBLE_BORDER)
     wxFLAGS_MEMBER(wxRAISED_BORDER)
     wxFLAGS_MEMBER(wxSTATIC_BORDER)

-    wxFLAGS_MEMBER(wxNO_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)

 
     // standard window styles
     wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
     wxFLAGS_MEMBER(wxCLIP_CHILDREN)
     wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
     wxFLAGS_MEMBER(wxWANTS_CHARS)
 
     // standard window styles
     wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
     wxFLAGS_MEMBER(wxCLIP_CHILDREN)
     wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
     wxFLAGS_MEMBER(wxWANTS_CHARS)

-    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)

     wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
     wxFLAGS_MEMBER(wxVSCROLL)
     wxFLAGS_MEMBER(wxHSCROLL)
     wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
     wxFLAGS_MEMBER(wxVSCROLL)
     wxFLAGS_MEMBER(wxHSCROLL)


@@ -318,7 +318,7 @@ bool wxListCtrl::Create(wxWindow *parent,
                         const wxPoint& pos,
                         const wxSize& size,
                         long style,
                         const wxPoint& pos,
                         const wxSize& size,
                         long style,

-                        const wxValidator& validator,
+                        const wxValidator& wxVALIDATOR_PARAM(validator),

                         const wxString& name)
 {
 #if wxUSE_VALIDATORS
                         const wxString& name)
 {
 #if wxUSE_VALIDATORS


@@ -1044,13 +1044,6 @@ wxRect wxListCtrl::GetViewRect() const
 
         wxZeroMemory(rc);
     }
 
         wxZeroMemory(rc);
     }

-    else
-    {
-        // VZ: I have no idea why is this needed but without it the listbook
-        //     control shows a tiny vertical scrollbar, make sure that it works
-        //     correctly if you decide to change this
-        rc.bottom += 5;
-    }

 
     wxRect rect;
     wxCopyRECTToRect(rc, rect);
 
     wxRect rect;
     wxCopyRECTToRect(rc, rect);


@@ -1112,7 +1105,7 @@ int wxListCtrl::GetItemCount() const
 
 wxSize wxListCtrl::GetItemSpacing() const
 {
 
 wxSize wxListCtrl::GetItemSpacing() const
 {

-    const int spacing = GetItemSpacing(HasFlag(wxLC_SMALL_ICON));
+    const int spacing = ListView_GetItemSpacing(GetHwnd(), (BOOL)HasFlag(wxLC_SMALL_ICON));

 
     return wxSize(LOWORD(spacing), HIWORD(spacing));
 }
 
     return wxSize(LOWORD(spacing), HIWORD(spacing));
 }