Somehow, setting a tint color makes gauge work :/.

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

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 01118eafb7b347b42d860d002ad8c435b1370db9..d48bf5a085b69d8dc15a5f4dcc0e4fdc7cd1ebea 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006

-// RCS-ID:      $Id$

 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -237,7 +236,7 @@ void wxVListBoxComboPopup::DismissWithEvent()
 
 void wxVListBoxComboPopup::SendComboBoxEvent( int selection )
 {
 
 void wxVListBoxComboPopup::SendComboBoxEvent( int selection )
 {

-    wxCommandEvent evt(wxEVT_COMMAND_COMBOBOX_SELECTED,m_combo->GetId());
+    wxCommandEvent evt(wxEVT_COMBOBOX,m_combo->GetId());

 
     evt.SetEventObject(m_combo);
 
 
     evt.SetEventObject(m_combo);
 


@@ -725,6 +724,8 @@ void wxVListBoxComboPopup::CalcWidths()
         // wxWindow::GetTextExtent (assuming same dc is used
         // for all calls, as we do here).
         wxClientDC dc(m_combo);
         // wxWindow::GetTextExtent (assuming same dc is used
         // for all calls, as we do here).
         wxClientDC dc(m_combo);

+        if ( !m_useFont.IsOk() )
+            m_useFont = m_combo->GetFont();

         dc.SetFont(m_useFont);
 
         for ( i=0; i<n; i++ )
         dc.SetFont(m_useFont);
 
         for ( i=0; i<n; i++ )


@@ -1171,6 +1172,18 @@ wxCoord wxOwnerDrawnComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const
     return -1;
 }
 
     return -1;
 }
 

+wxSize wxOwnerDrawnComboBox::DoGetBestSize() const
+{
+    if ( GetCount() == 0 )
+        return wxComboCtrlBase::DoGetBestSize();
+
+    wxOwnerDrawnComboBox* odc = const_cast<wxOwnerDrawnComboBox*>(this);
+    // TODO: this class may also have GetHightestItemHeight() and
+    // GetHightestItem() methods, and so set the whole (edit part + arrow)
+    // control's height according with this max height, not only max width.
+    return GetSizeFromTextSize(odc->GetWidestItemWidth());
+}
+

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