remove/replace redundant SetAutoLayout() and Fit() calls, leave just SetSizer[AndFit...

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

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 4d39e83afa1c8b58cc52dbcd951ec0876dc78d05..d79d692b18799668d5af6e24e5e502ebef9ef92a 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -33,6 +33,7 @@
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"

+    #include "wx/textctrl.h"

 #endif
 
 #include "wx/combo.h"
 #endif
 
 #include "wx/combo.h"


@@ -107,10 +108,16 @@ void wxVListBoxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect )
 {
     if ( !(m_combo->GetWindowStyle() & wxODCB_STD_CONTROL_PAINT) )
     {
 {
     if ( !(m_combo->GetWindowStyle() & wxODCB_STD_CONTROL_PAINT) )
     {

-        OnDrawBg(dc,rect,m_value,wxODCB_PAINTING_CONTROL);
+        int flags = wxODCB_PAINTING_CONTROL;
+
+        if ( m_combo->ShouldDrawFocus() )
+            flags |= wxODCB_PAINTING_SELECTED;
+
+        OnDrawBg(dc, rect, m_value, flags);
+

         if ( m_value >= 0 )
         {
         if ( m_value >= 0 )
         {

-            OnDrawItem(dc,rect,m_value,wxODCB_PAINTING_CONTROL);
+            OnDrawItem(dc,rect,m_value,flags);

             return;
         }
     }
             return;
         }
     }


@@ -123,13 +130,20 @@ void wxVListBoxComboPopup::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) co
     // TODO: Maybe this code could be moved to wxVListBox::OnPaint?
     dc.SetFont(m_useFont);
 
     // TODO: Maybe this code could be moved to wxVListBox::OnPaint?
     dc.SetFont(m_useFont);
 

+    int flags = 0;
+

     // Set correct text colour for selected items
     if ( wxVListBox::GetSelection() == (int) n )
     // Set correct text colour for selected items
     if ( wxVListBox::GetSelection() == (int) n )

+    {

         dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
         dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );

+        flags |= wxODCB_PAINTING_SELECTED;
+    }

     else
     else

+    {

         dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
         dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );

+    }

 
 

-    OnDrawItem(dc,rect,(int)n,0);
+    OnDrawItem(dc,rect,(int)n,flags);

 }
 
 wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const
 }
 
 wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const


@@ -165,6 +179,9 @@ void wxVListBoxComboPopup::OnDrawBg( wxDC& dc,
     wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 

+    if ( IsCurrent((size_t)item) && !(flags & wxODCB_PAINTING_CONTROL) )
+        flags |= wxODCB_PAINTING_SELECTED;
+

     combo->OnDrawBackground(dc,rect,item,flags);
 }
 
     combo->OnDrawBackground(dc,rect,item,flags);
 }
 


@@ -192,16 +209,15 @@ void wxVListBoxComboPopup::DismissWithEvent()
 
     Dismiss();
 
 
     Dismiss();
 

-    wxString valStr;

     if ( selection != wxNOT_FOUND )
     if ( selection != wxNOT_FOUND )

-        valStr = m_strings[selection];
+        m_stringValue = m_strings[selection];

     else
     else

-        valStr = wxEmptyString;
+        m_stringValue = wxEmptyString;

 
 

-    m_value = selection;
+    if ( m_stringValue != m_combo->GetValue() )
+        m_combo->SetValueWithEvent(m_stringValue);

 
 

-    if ( valStr != m_combo->GetValue() )
-        m_combo->SetValue(valStr);
+    m_value = selection;

 
     SendComboBoxEvent(selection);
 }
 
     SendComboBoxEvent(selection);
 }


@@ -390,7 +406,7 @@ void wxVListBoxComboPopup::OnMouseMove(wxMouseEvent& event)
     const size_t lineMax = GetVisibleEnd();
     for ( size_t line = GetVisibleBegin(); line < lineMax; line++ )
     {
     const size_t lineMax = GetVisibleEnd();
     for ( size_t line = GetVisibleBegin(); line < lineMax; line++ )
     {

-        y -= OnGetLineHeight(line);
+        y -= OnGetRowHeight(line);

         if ( y < 0 )
         {
             // Only change selection if item is fully visible
         if ( y < 0 )
         {
             // Only change selection if item is fully visible


@@ -410,17 +426,24 @@ void wxVListBoxComboPopup::OnLeftClick(wxMouseEvent& WXUNUSED(event))
 
 void wxVListBoxComboPopup::OnKey(wxKeyEvent& event)
 {
 
 void wxVListBoxComboPopup::OnKey(wxKeyEvent& event)
 {

-    // Select item if ENTER is pressed
-    if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER )
-    {
-        DismissWithEvent();
-    }
-    // Hide popup if ESC is pressed
-    else if ( event.GetKeyCode() == WXK_ESCAPE )
+    // Hide popup if certain key or key combination was pressed
+    if ( m_combo->IsKeyPopupToggle(event) )

     {
         StopPartialCompletion();
         Dismiss();
     }
     {
         StopPartialCompletion();
         Dismiss();
     }

+    else if ( event.AltDown() )
+    {
+        // On both wxGTK and wxMSW, pressing Alt down seems to
+        // completely freeze things in popup (ie. arrow keys and
+        // enter won't work).
+        return;
+    }
+    // Select item if ENTER is pressed
+    else if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER )
+    {
+        DismissWithEvent();
+    }

     else
     {
         int comboStyle = m_combo->GetWindowStyle();
     else
     {
         int comboStyle = m_combo->GetWindowStyle();


@@ -448,6 +471,8 @@ void wxVListBoxComboPopup::Insert( const wxString& item, int pos )
     }
 
     m_strings.Insert(item,pos);
     }
 
     m_strings.Insert(item,pos);

+    m_clientDatas.Insert(NULL, pos);
+

     m_widths.Insert(-1,pos);
     m_widthsDirty = true;
 
     m_widths.Insert(-1,pos);
     m_widthsDirty = true;
 


@@ -518,7 +543,6 @@ void wxVListBoxComboPopup::SetItemClientData( unsigned int n,
     // It should be sufficient to update this variable only here
     m_clientDataItemsType = clientDataItemsType;
 
     // It should be sufficient to update this variable only here
     m_clientDataItemsType = clientDataItemsType;
 

-    m_clientDatas.SetCount(n+1,NULL);

     m_clientDatas[n] = clientData;
 
     ItemWidthChanged(n);
     m_clientDatas[n] = clientData;
 
     ItemWidthChanged(n);


@@ -549,8 +573,16 @@ void wxVListBoxComboPopup::Delete( unsigned int item )
     if ( (int)item == m_widestItem )
         m_findWidest = true;
 
     if ( (int)item == m_widestItem )
         m_findWidest = true;
 

+    int sel = GetSelection();
+

     if ( IsCreated() )
         wxVListBox::SetItemCount( wxVListBox::GetItemCount()-1 );
     if ( IsCreated() )
         wxVListBox::SetItemCount( wxVListBox::GetItemCount()-1 );

+
+    // Fix selection
+    if ( (int)item < sel )
+        SetSelection(sel-1);
+    else if ( (int)item == sel )
+        SetSelection(wxNOT_FOUND);

 }
 
 int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const
 }
 
 int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const


@@ -576,9 +608,7 @@ void wxVListBoxComboPopup::SetString( int item, const wxString& str )
 
 wxString wxVListBoxComboPopup::GetStringValue() const
 {
 
 wxString wxVListBoxComboPopup::GetStringValue() const
 {

-    if ( m_value >= 0 )
-        return m_strings[m_value];
-    return wxEmptyString;
+    return m_stringValue;

 }
 
 void wxVListBoxComboPopup::SetSelection( int item )
 }
 
 void wxVListBoxComboPopup::SetSelection( int item )


@@ -588,6 +618,11 @@ void wxVListBoxComboPopup::SetSelection( int item )
 
     m_value = item;
 
 
     m_value = item;
 

+    if ( item >= 0 )
+        m_stringValue = m_strings[item];
+    else
+        m_stringValue = wxEmptyString;
+

     if ( IsCreated() )
         wxVListBox::SetSelection(item);
 }
     if ( IsCreated() )
         wxVListBox::SetSelection(item);
 }


@@ -601,10 +636,13 @@ void wxVListBoxComboPopup::SetStringValue( const wxString& value )
 {
     int index = m_strings.Index(value);
 
 {
     int index = m_strings.Index(value);
 

-    m_value = index;
+    m_stringValue = value;

 
 

-    if ( index >= -1 && index < (int)wxVListBox::GetItemCount() )
+    if ( index >= 0 && index < (int)wxVListBox::GetItemCount() )
+    {

         wxVListBox::SetSelection(index);
         wxVListBox::SetSelection(index);

+        m_value = index;
+    }

 }
 
 void wxVListBoxComboPopup::CalcWidths()
 }
 
 void wxVListBoxComboPopup::CalcWidths()


@@ -700,6 +738,8 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int
 {
     int height = 250;
 
 {
     int height = 250;
 

+    maxHeight -= 2;  // Must take borders into account
+

     if ( m_strings.GetCount() )
     {
         if ( prefHeight > 0 )
     if ( m_strings.GetCount() )
     {
         if ( prefHeight > 0 )


@@ -719,8 +759,7 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int
             // NB: Calculations that take variable height into account
             //     are unnecessary.
             int fih = GetLineHeight(0);
             // NB: Calculations that take variable height into account
             //     are unnecessary.
             int fih = GetLineHeight(0);

-            int shown = height/fih;
-            height = shown * fih;
+            height -= height % fih;

         }
     }
     else
         }
     }
     else


@@ -772,7 +811,19 @@ BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems, "wx/odcombo.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox)
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxOwnerDrawnComboBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxOwnerDrawnComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
+#else

 IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems)
 IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems)

+#endif

 
 void wxOwnerDrawnComboBox::Init()
 {
 
 void wxOwnerDrawnComboBox::Init()
 {


@@ -879,7 +930,7 @@ void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* popup)
 // wxOwnerDrawnComboBox item manipulation methods
 // ----------------------------------------------------------------------------
 
 // wxOwnerDrawnComboBox item manipulation methods
 // ----------------------------------------------------------------------------
 

-void wxOwnerDrawnComboBox::Clear()
+void wxOwnerDrawnComboBox::DoClear()

 {
     EnsurePopupControl();
 
 {
     EnsurePopupControl();
 


@@ -888,7 +939,7 @@ void wxOwnerDrawnComboBox::Clear()
     SetValue(wxEmptyString);
 }
 
     SetValue(wxEmptyString);
 }
 

-void wxOwnerDrawnComboBox::Delete(unsigned int n)
+void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n)

 {
     wxCHECK_RET( IsValid(n), _T("invalid index in wxOwnerDrawnComboBox::Delete") );
 
 {
     wxCHECK_RET( IsValid(n), _T("invalid index in wxOwnerDrawnComboBox::Delete") );
 


@@ -962,31 +1013,29 @@ int wxOwnerDrawnComboBox::GetSelection() const
     return GetVListBoxComboPopup()->GetSelection();
 }
 
     return GetVListBoxComboPopup()->GetSelection();
 }
 

-int wxOwnerDrawnComboBox::DoAppend(const wxString& item)
+int wxOwnerDrawnComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                                        unsigned int pos,
+                                        void **clientData,
+                                        wxClientDataType type)

 {
     EnsurePopupControl();
 {
     EnsurePopupControl();

-    wxASSERT(m_popupInterface);
-
-    return GetVListBoxComboPopup()->Append(item);
-}

 
 

-int wxOwnerDrawnComboBox::DoInsert(const wxString& item, unsigned int pos)
-{
-    EnsurePopupControl();
-
-    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
-    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
-
-    GetVListBoxComboPopup()->Insert(item,pos);
+    const unsigned int count = items.GetCount();
+    for( unsigned int i = 0; i < count; ++i, ++pos )
+    {
+        GetVListBoxComboPopup()->Insert(items[i], pos);
+        AssignNewItemClientData(pos, clientData, i, type);
+    }

 
 

-    return pos;
+    return pos - 1;

 }
 
 void wxOwnerDrawnComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
     EnsurePopupControl();
 
 }
 
 void wxOwnerDrawnComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
     EnsurePopupControl();
 

-    GetVListBoxComboPopup()->SetItemClientData(n,clientData,m_clientDataItemsType);
+    GetVListBoxComboPopup()->SetItemClientData(n, clientData,
+                                               GetClientDataType());

 }
 
 void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const
 }
 
 void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const


@@ -997,16 +1046,6 @@ void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const
     return GetVListBoxComboPopup()->GetItemClientData(n);
 }
 
     return GetVListBoxComboPopup()->GetItemClientData(n);
 }
 

-void wxOwnerDrawnComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
-    DoSetItemClientData(n, (void*) clientData);
-}
-
-wxClientData* wxOwnerDrawnComboBox::DoGetItemClientObject(unsigned int n) const
-{
-    return (wxClientData*) DoGetItemClientData(n);
-}
-

 // ----------------------------------------------------------------------------
 // wxOwnerDrawnComboBox item drawing and measuring default implementations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxOwnerDrawnComboBox item drawing and measuring default implementations
 // ----------------------------------------------------------------------------


@@ -1038,20 +1077,25 @@ wxCoord wxOwnerDrawnComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const
     return -1;
 }
 
     return -1;
 }
 

-void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const
+void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc,
+                                            const wxRect& rect,
+                                            int WXUNUSED(item),
+                                            int flags) const

 {
 {

-    // we need to render selected and current items differently
-    if ( GetVListBoxComboPopup()->IsCurrent((size_t)item) ||
-         (flags & wxODCB_PAINTING_CONTROL) )
+    // We need only to explicitly draw background for items
+    // that should have selected background. Also, call PrepareBackground
+    // always when painting the control so that clipping is done properly.
+
+    if ( (flags & wxODCB_PAINTING_SELECTED) ||
+         ((flags & wxODCB_PAINTING_CONTROL) && HasFlag(wxCB_READONLY)) )

     {
     {

-        int focusFlag = wxCONTROL_SELECTED;
+        int bgFlags = wxCONTROL_SELECTED;

 
 

-        if ( flags & wxODCB_PAINTING_CONTROL != wxODCB_PAINTING_CONTROL )
-            focusFlag |= wxCONTROL_ISSUBMENU;
+        if ( !(flags & wxODCB_PAINTING_CONTROL) )
+            bgFlags |= wxCONTROL_ISSUBMENU;

 
 

-        DrawFocusBackground(dc, rect, focusFlag );
+        PrepareBackground(dc, rect, bgFlags);

     }
     }

-    //else: do nothing for the normal items

 }
 
 #endif // wxUSE_ODCOMBOBOX
 }
 
 #endif // wxUSE_ODCOMBOBOX