only formatting changes. s/FALSE/false and s/TRUE/true; remove excessive empty lines...

[wxWidgets.git] / src / generic / vlbox.cpp

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index 4d2722220598fc0979ba576bd785844f7847dbd0..13ce1b6278faa2c1d41804cd367edb869f2fc409 100644 (file)
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -51,6 +51,8 @@ BEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow)
 
     EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus)
     EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus)
 
     EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus)
     EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus)

+
+    EVT_SIZE(wxVListBox::OnSize)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -58,6 +60,7 @@ END_EVENT_TABLE()
 // ============================================================================
 
 IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow)
 // ============================================================================
 
 IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow)

+const char wxVListBoxNameStr[] = "wxVListBox";

 
 // ----------------------------------------------------------------------------
 // wxVListBox creation
 
 // ----------------------------------------------------------------------------
 // wxVListBox creation


@@ -78,8 +81,8 @@ bool wxVListBox::Create(wxWindow *parent,
                         const wxString& name)
 {
 #ifdef __WXMSW__
                         const wxString& name)
 {
 #ifdef __WXMSW__

-       if ((style & wxBORDER_MASK) == wxDEFAULT)
-               style |= wxBORDER_THEME;
+    if ( (style & wxBORDER_MASK) == wxDEFAULT )
+        style |= wxBORDER_THEME;

 #endif
 
     style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;
 #endif
 
     style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;


@@ -110,6 +113,10 @@ wxVListBox::~wxVListBox()
 
 void wxVListBox::SetItemCount(size_t count)
 {
 
 void wxVListBox::SetItemCount(size_t count)
 {

+    // don't leave the current index invalid
+    if ( m_current != wxNOT_FOUND && (size_t)m_current >= count )
+        m_current = count - 1; // also ok when count == 0 as wxNOT_FOUND == -1
+

     if ( m_selStore )
     {
         // tell the selection store that our number of items has changed
     if ( m_selStore )
     {
         // tell the selection store that our number of items has changed


@@ -254,15 +261,19 @@ bool wxVListBox::DoSetCurrent(int current)
     return true;
 }
 
     return true;
 }
 

+void wxVListBox::InitEvent(wxCommandEvent& event, int n)
+{
+    event.SetEventObject(this);
+    event.SetInt(n);
+}
+

 void wxVListBox::SendSelectedEvent()
 {
     wxASSERT_MSG( m_current != wxNOT_FOUND,
                     _T("SendSelectedEvent() shouldn't be called") );
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
 void wxVListBox::SendSelectedEvent()
 {
     wxASSERT_MSG( m_current != wxNOT_FOUND,
                     _T("SendSelectedEvent() shouldn't be called") );
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());

-    event.SetEventObject(this);
-    event.SetInt(m_current);
-
+    InitEvent(event, m_current);

     (void)GetEventHandler()->ProcessEvent(event);
 }
 
     (void)GetEventHandler()->ProcessEvent(event);
 }
 


@@ -321,6 +332,31 @@ void wxVListBox::RefreshSelected()
     }
 }
 
     }
 }
 

+wxRect wxVListBox::GetItemRect(size_t n) const
+{
+    wxRect itemrect;
+
+    // check that this item is visible
+    const size_t lineMax = GetVisibleEnd();
+    if ( n >= lineMax )
+        return itemrect;
+    size_t line = GetVisibleBegin();
+    if ( n < line )
+        return itemrect;
+
+    while ( line <= n )
+    {
+        itemrect.y += itemrect.height;
+        itemrect.height = OnGetRowHeight(line);
+
+        line++;
+    }
+
+    itemrect.width = GetClientSize().x;
+
+    return itemrect;
+}
+

 // ----------------------------------------------------------------------------
 // wxVListBox appearance parameters
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxVListBox appearance parameters
 // ----------------------------------------------------------------------------


@@ -371,7 +407,7 @@ wxVListBox::DoDrawSolidBackground(const wxColour& col,
     {
         if ( isSelected )
         {
     {
         if ( isSelected )
         {

-            dc.SetBrush(wxBrush(col, wxSOLID));
+            dc.SetBrush(wxBrush(col, wxBRUSHSTYLE_SOLID));

         }
         else // !selected
         {
         }
         else // !selected
         {


@@ -395,11 +431,11 @@ void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
             flags |= wxCONTROL_SELECTED;
         if ( IsCurrent(n) )
             flags |= wxCONTROL_CURRENT;
             flags |= wxCONTROL_SELECTED;
         if ( IsCurrent(n) )
             flags |= wxCONTROL_CURRENT;

-        if ( wxWindow::FindFocus() == wx_const_cast(wxVListBox*, this) )
+        if ( wxWindow::FindFocus() == const_cast<wxVListBox*>(this) )

             flags |= wxCONTROL_FOCUSED;
 
         wxRendererNative::Get().DrawItemSelectionRect(
             flags |= wxCONTROL_FOCUSED;
 
         wxRendererNative::Get().DrawItemSelectionRect(

-            wx_const_cast(wxVListBox *, this), dc, rect, flags);
+            const_cast<wxVListBox *>(this), dc, rect, flags);

     }
 }
 
     }
 }
 


@@ -465,6 +501,11 @@ void wxVListBox::OnSetOrKillFocus(wxFocusEvent& WXUNUSED(event))
     RefreshSelected();
 }
 
     RefreshSelected();
 }
 

+void wxVListBox::OnSize(wxSizeEvent& event)
+{
+    UpdateScrollbar();
+    event.Skip();
+}

 
 // ============================================================================
 // wxVListBox keyboard/mouse handling
 
 // ============================================================================
 // wxVListBox keyboard/mouse handling


@@ -671,9 +712,7 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
         if ( item == m_current )
         {
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());
         if ( item == m_current )
         {
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());

-            event.SetEventObject(this);
-            event.SetInt(item);
-
+            InitEvent(event, item);

             (void)GetEventHandler()->ProcessEvent(event);
         }
         else
             (void)GetEventHandler()->ProcessEvent(event);
         }
         else