Don't return invalid size from wxDir::GetTotalSize() for empty dirs.

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

diff --git a/src/common/bmpcboxcmn.cpp b/src/common/bmpcboxcmn.cpp
index 71b37abc19a58ed512ffd99a112b332743636cce..fc403b713520e0f6cf859b946039f731a897e076 100644 (file)
--- 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;
 }