Add wxRichTextModuleInit

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

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index ebe2ad77c2450ac73ffaede5d6a8a8b6a29e2000..2a3ca54d1cbce461ab5a6664f0dd6fb3af239648 100644 (file)
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        generic/vlbox.cpp
+// Name:        src/generic/vlbox.cpp

 // Purpose:     implementation of wxVListBox
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxVListBox
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -26,12 +26,15 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/vlbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"

+    #include "wx/listbox.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/vlbox.h"
+#include "wx/dcbuffer.h"

 #include "wx/selstore.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/selstore.h"
 
 // ----------------------------------------------------------------------------


@@ -82,6 +85,9 @@ bool wxVListBox::Create(wxWindow *parent,
     SetBackgroundColour(GetBackgroundColour());
     m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
 
     SetBackgroundColour(GetBackgroundColour());
     m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
 

+    // flicker-free drawing requires this
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+

     return true;
 }
 
     return true;
 }
 


@@ -224,10 +230,8 @@ bool wxVListBox::DoSetCurrent(int current)
         {
             // it is, indeed, only partly visible, so scroll it into view to
             // make it entirely visible
         {
             // it is, indeed, only partly visible, so scroll it into view to
             // make it entirely visible

-            if ( (size_t)m_current == GetLastVisibleLine() )
-            {
-                ScrollToLine(m_current);
-            }
+            while ( (size_t)m_current == GetLastVisibleLine() &&
+                    ScrollToLine(GetVisibleBegin()+1) ) ;

 
             // but in any case refresh it as even if it was only partly visible
             // before we need to redraw it entirely as its background changed
 
             // but in any case refresh it as even if it was only partly visible
             // before we need to redraw it entirely as its background changed


@@ -258,7 +262,10 @@ void wxVListBox::SetSelection(int selection)
 
     if ( HasMultipleSelection() )
     {
 
     if ( HasMultipleSelection() )
     {

-        Select(selection);
+        if (selection != wxNOT_FOUND)
+            Select(selection);
+        else
+            DeselectAll();

         m_anchor = selection;
     }
 
         m_anchor = selection;
     }
 


@@ -351,18 +358,24 @@ void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
 
 void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 
 void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
 {

-    wxPaintDC dc(this);
+    wxSize clientSize = GetClientSize();
+
+    wxAutoBufferedPaintDC dc(this);

 
     // the update rectangle
     wxRect rectUpdate = GetUpdateClientRect();
 
 
     // the update rectangle
     wxRect rectUpdate = GetUpdateClientRect();
 

+    // fill it with background colour
+    dc.SetBackground(GetBackgroundColour());
+    dc.Clear();
+

     // the bounding rectangle of the current line
     wxRect rectLine;
     // the bounding rectangle of the current line
     wxRect rectLine;

-    rectLine.width = GetClientSize().x;
+    rectLine.width = clientSize.x;

 
     // iterate over all visible lines
 
     // iterate over all visible lines

-    const size_t lineMax = GetLastVisibleLine();
-    for ( size_t line = GetFirstVisibleLine(); line <= lineMax; line++ )
+    const size_t lineMax = GetVisibleEnd();
+    for ( size_t line = GetFirstVisibleLine(); line < lineMax; line++ )

     {
         const wxCoord hLine = OnGetLineHeight(line);
 
     {
         const wxCoord hLine = OnGetLineHeight(line);
 


@@ -519,13 +532,11 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_PAGEDOWN:
             break;
 
         case WXK_PAGEDOWN:

-        case WXK_NEXT:

             PageDown();
             current = GetFirstVisibleLine();
             break;
 
         case WXK_PAGEUP:
             PageDown();
             current = GetFirstVisibleLine();
             break;
 
         case WXK_PAGEUP:

-        case WXK_PRIOR:

             if ( m_current == (int)GetFirstVisibleLine() )
             {
                 PageUp();
             if ( m_current == (int)GetFirstVisibleLine() )
             {
                 PageUp();


@@ -577,7 +588,7 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
 void wxVListBox::OnLeftDown(wxMouseEvent& event)
 {
     SetFocus();
 void wxVListBox::OnLeftDown(wxMouseEvent& event)
 {
     SetFocus();

-    
+

     int item = HitTest(event.GetPosition());
 
     if ( item != wxNOT_FOUND )
     int item = HitTest(event.GetPosition());
 
     if ( item != wxNOT_FOUND )


@@ -599,16 +610,27 @@ void wxVListBox::OnLeftDown(wxMouseEvent& event)
     }
 }
 
     }
 }
 

-void wxVListBox::OnLeftDClick(wxMouseEvent& event)
+void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)

 {
 {

-    int item = HitTest(event.GetPosition());
+    int item = HitTest(eventMouse.GetPosition());

     if ( item != wxNOT_FOUND )
     {
     if ( item != wxNOT_FOUND )
     {

-        wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());
-        event.SetEventObject(this);
-        event.SetInt(item);

 
 

-        (void)GetEventHandler()->ProcessEvent(event);
+        // if item double-clicked was not yet selected, then treat
+        // this event as a left-click instead
+        if ( item == m_current )
+        {
+            wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());
+            event.SetEventObject(this);
+            event.SetInt(item);
+
+            (void)GetEventHandler()->ProcessEvent(event);
+        }
+        else
+        {
+            OnLeftDown(eventMouse);
+        }
+

     }
 }
 
     }
 }
 


@@ -617,8 +639,6 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& event)
 // use the same default attributes as wxListBox
 // ----------------------------------------------------------------------------
 
 // use the same default attributes as wxListBox
 // ----------------------------------------------------------------------------
 

-#include "wx/listbox.h"
-

 //static
 wxVisualAttributes
 wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)
 //static
 wxVisualAttributes
 wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)


@@ -626,4 +646,4 @@ wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)
     return wxListBox::GetClassDefaultAttributes(variant);
 }
 
     return wxListBox::GetClassDefaultAttributes(variant);
 }
 

-#endif
\ No newline at end of file
+#endif