Compilation fix for r74440 and STL builds.

[wxWidgets.git] / src / common / bmpcboxcmn.cpp

diff --git a/src/common/bmpcboxcmn.cpp b/src/common/bmpcboxcmn.cpp
index 0e869aeedb9dfb3df94695c72fa9a9e9a5311c49..c4c963dff4f49e95d8bb8d70d008307f638f664c 100644 (file)
--- a/src/common/bmpcboxcmn.cpp
+++ b/src/common/bmpcboxcmn.cpp
@@ -38,7 +38,7 @@
 #include "wx/odcombo.h"
 
 
 #include "wx/odcombo.h"
 
 

-const wxChar wxBitmapComboBoxNameStr[] = wxT("bitmapComboBox");
+const char wxBitmapComboBoxNameStr[] = "bitmapComboBox";

 
 #if defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED)
 
 
 #if defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED)
 


@@ -222,7 +222,7 @@ void wxBitmapComboBoxBase::DrawItem(wxDC& dc,
                       true);
     }
 
                       true);
     }
 

-    if ( text.length() )
+    if ( !text.empty() )

         dc.DrawText(text,
                     rect.x + m_imgAreaWidth + 1,
                     rect.y + (rect.height-dc.GetCharHeight())/2);
         dc.DrawText(text,
                     rect.x + m_imgAreaWidth + 1,
                     rect.y + (rect.height-dc.GetCharHeight())/2);


@@ -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;
     }
         int imgHeightArea = m_usedImgSize.y + 2;
         return imgHeightArea > m_fontHeight ? imgHeightArea : m_fontHeight;
     }

-    
+

     return wxBCB_DEFAULT_ITEM_HEIGHT;
 }
 
     return wxBCB_DEFAULT_ITEM_HEIGHT;
 }