Fix wxWrapSizer minimal size calculation.

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 0f7befea19441e94d0900c4395a97177e2c21ca7..ccabb7277e576b60100b832f8cb225dd240ca91b 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -23,9 +23,12 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_COMBOCTRL
-
+#if wxUSE_COMBOBOX
 #include "wx/combobox.h"
+extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
+#endif
+
+#if wxUSE_COMBOCTRL
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -81,11 +84,7 @@ wxFLAGS_MEMBER(wxCB_DROPDOWN)
 
 wxEND_FLAGS( wxComboBoxStyle )
 
-#ifdef __WXUNIVERSAL__
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
-#else
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice, "wx/combobox.h")
-#endif
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)
 wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
@@ -2131,7 +2130,7 @@ void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
     }
 
     // This must be done after creation
-    if ( m_valueString.length() )
+    if ( !m_valueString.empty() )
     {
         iface->SetStringValue(m_valueString);
         //Refresh();