X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..bcc0da5ce3f0b78c1592c16dc3e2334fa87d72cb:/src/univ/combobox.cpp

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index b90ef9ff70..2a7117c254 100644
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -88,7 +88,7 @@ public:
         SetBitmapSelected(bmpPressed);
         SetBitmapDisabled(bmpDisabled);
 
-        SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());
+//        SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());
     }
 
 protected:
@@ -201,6 +201,8 @@ void wxComboControl::Init()
     m_popup = (wxComboPopup *)NULL;
     m_winPopup = (wxPopupComboWindow *)NULL;
     m_isPopupShown = FALSE;
+    m_btn = NULL;
+    m_text = NULL;
 }
 
 bool wxComboControl::Create(wxWindow *parent,
@@ -298,8 +300,7 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
     width -= rectBorders.x + rectBorders.width;
     height -= rectBorders.y + rectBorders.height;
 
-    wxSize sizeBtn = m_btn->GetSize(),
-           sizeText = m_text->GetSize();
+    wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;
     m_text->SetSize(x, y, wText, height);
@@ -326,8 +327,11 @@ bool wxComboControl::Show(bool show)
     if ( !wxControl::Show(show) )
         return FALSE;
 
-    m_btn->Show(show);
-    m_text->Show(show);
+    if (m_btn)
+        m_btn->Show(show);
+    
+    if (m_text)
+        m_text->Show(show);
 
     return TRUE;
 }