X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f696015cf1e474315b63823d697a5fa0462055b7..c437b3f4e47b74715a2f2385d4862972babd7802:/src/common/bmpcboxcmn.cpp diff --git a/src/common/bmpcboxcmn.cpp b/src/common/bmpcboxcmn.cpp index 71b37abc19..fc403b7135 100644 --- a/src/common/bmpcboxcmn.cpp +++ b/src/common/bmpcboxcmn.cpp @@ -3,7 +3,7 @@ // Purpose: wxBitmapComboBox // Author: Jaakko Salli // Created: 2008-04-09 -// RCS-ID: $Id:$ +// RCS-ID: $Id$ // Copyright: (c) 2008 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -28,6 +28,8 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/dc.h" + #include "wx/ctrlsub.h" #endif #include "wx/settings.h" @@ -36,7 +38,7 @@ #include "wx/odcombo.h" -const wxChar wxBitmapComboBoxNameStr[] = wxT("bitmapComboBox"); +const char wxBitmapComboBoxNameStr[] = "bitmapComboBox"; #if defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED) @@ -233,7 +235,7 @@ wxCoord wxBitmapComboBoxBase::MeasureItem(size_t WXUNUSED(item)) const int imgHeightArea = m_usedImgSize.y + 2; return imgHeightArea > m_fontHeight ? imgHeightArea : m_fontHeight; } - + return wxBCB_DEFAULT_ITEM_HEIGHT; }