X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c574bfa9022576fd0444be7155b0e22e6f6b8d85..90e15296e9208a869efcc96329597fa3bf263d26:/src/common/bmpcboxcmn.cpp diff --git a/src/common/bmpcboxcmn.cpp b/src/common/bmpcboxcmn.cpp index 0e869aeedb..fc403b7135 100644 --- a/src/common/bmpcboxcmn.cpp +++ b/src/common/bmpcboxcmn.cpp @@ -38,7 +38,7 @@ #include "wx/odcombo.h" -const wxChar wxBitmapComboBoxNameStr[] = wxT("bitmapComboBox"); +const char wxBitmapComboBoxNameStr[] = "bitmapComboBox"; #if defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED) @@ -235,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; }