don't add 7 and 14 pixel horz/vertical padding in DoGetBestSize() when the best size...

[wxWidgets.git] / src / xrc / xh_odcombo.cpp

diff --git a/src/xrc/xh_odcombo.cpp b/src/xrc/xh_odcombo.cpp
index aa8707aecfcfbe6e691bf40b07adf5d454c18009..df1ece9ef35b8eefde819a325db5765927637209 100644 (file)
--- a/src/xrc/xh_odcombo.cpp
+++ b/src/xrc/xh_odcombo.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/textctrl.h"
 #endif
 
 #include "wx/odcombo.h"
@@ -37,6 +38,7 @@ wxOwnerDrawnComboBoxXmlHandler::wxOwnerDrawnComboBoxXmlHandler()
     XRC_ADD_STYLE(wxCB_DROPDOWN);
     XRC_ADD_STYLE(wxODCB_STD_CONTROL_PAINT);
     XRC_ADD_STYLE(wxODCB_DCLICK_CYCLES);
+    XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
     AddWindowStyles();
 }
 
@@ -71,8 +73,6 @@ wxObject *wxOwnerDrawnComboBoxXmlHandler::DoCreateResource()
                         wxDefaultValidator,
                         GetName());
 
-        control->SetPopupControl(NULL);
-
         wxSize ButtonSize=GetSize(wxT("buttonsize"));
 
         if (ButtonSize != wxDefaultSize)