OS/2 fixes for this week.

[wxWidgets.git] / src / univ / combobox.cpp

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index b90ef9ff703ad11eee1d077e2dbfd6fd3d869673..76544591d44bb34a5987cf3349336d3851e6e85c 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -76,25 +76,35 @@ public:
     wxComboButton(wxComboControl *combo)
         : wxBitmapButton(combo->GetParent(), -1, wxNullBitmap,
                          wxDefaultPosition, wxDefaultSize,
-                         wxBORDER_NONE)
+                         wxBORDER_NONE | wxBU_EXACTFIT)
     {
         m_combo = combo;
 
-        wxBitmap bmpNormal, bmpPressed, bmpDisabled;
+        wxBitmap bmpNormal, bmpFocus, bmpPressed, bmpDisabled;
+
+        GetRenderer()->GetComboBitmaps(&bmpNormal,
+                                       &bmpFocus,
+                                       &bmpPressed,
+                                       &bmpDisabled);
 
-        GetRenderer()->GetComboBitmaps(&bmpNormal, &bmpPressed, &bmpDisabled);
         SetBitmapLabel(bmpNormal);
-        SetBitmapFocus(bmpNormal);
-        SetBitmapSelected(bmpPressed);
-        SetBitmapDisabled(bmpDisabled);
+        SetBitmapFocus(bmpFocus.Ok() ? bmpFocus : bmpNormal);
+        SetBitmapSelected(bmpPressed.Ok() ? bmpPressed : bmpNormal);
+        SetBitmapDisabled(bmpDisabled.Ok() ? bmpDisabled : bmpNormal);
 
-        SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());
+        SetBestSize(wxDefaultSize);
     }
 
 protected:
     void OnButton(wxCommandEvent& event) { m_combo->ShowPopup(); }
 
-    virtual wxSize DoGetBestSize() const { return GetSize(); }
+    virtual wxSize DoGetBestClientSize() const
+    {
+        const wxBitmap& bmp = GetBitmapLabel();
+
+        return wxSize(bmp.GetWidth(), bmp.GetHeight());
+
+    }
 
 private:
     wxComboControl *m_combo;
@@ -201,6 +211,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,
@@ -239,7 +251,8 @@ bool wxComboControl::Create(wxWindow *parent,
         m_heightPopup = size.y - DoGetBestSize().y;
     }
 
-    DoSetSize(pos.x, pos.y, size.x, size.y);
+    SetBestSize(size);
+    Move(pos);
 
     // create the popup window immediately here to allow creating the controls
     // with parent == GetPopupWindow() from the derived class ctor
@@ -298,12 +311,11 @@ 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->GetBestSize();
 
     wxCoord wText = width - sizeBtn.x;
     m_text->SetSize(x, y, wText, height);
-    m_btn->SetSize(x + wText, y, -1, height);
+    m_btn->SetSize(x + wText, y, sizeBtn.x, height);
 }
 
 // ----------------------------------------------------------------------------
@@ -326,8 +338,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;
 }