Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk / bmpcbox.h

diff --git a/include/wx/gtk/bmpcbox.h b/include/wx/gtk/bmpcbox.h
index f146577248f5643ea4bcccbbd4b272d8ad1f453d..bfa3399b3b38a14036896b3b954d05fb9b0ae828 100644 (file)
--- a/include/wx/gtk/bmpcbox.h
+++ b/include/wx/gtk/bmpcbox.h
@@ -3,7 +3,7 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-05-19
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-05-19

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

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


@@ -133,6 +133,8 @@ protected:
     virtual void GTKCreateComboBoxWidget();
     virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text );
 
     virtual void GTKCreateComboBoxWidget();
     virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text );
 

+    virtual wxSize DoGetBestSize() const;
+

     wxSize                  m_bitmapSize;
     int                     m_bitmapCellIndex;
 
     wxSize                  m_bitmapSize;
     int                     m_bitmapCellIndex;