Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 670782 ] Combobox uses popup window width

Browse Source 
(wxUniv)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-02-02 14:47:04 +00:00
parent 61a83c1c50
commit e2ca829e7d
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/univ/combobox.h
View File

@@ -83,6 +83,8 @@ public:
// called immediately after the control is shown // called immediately after the control is shown
virtual void OnShow() = 0; virtual void OnShow() = 0;
virtual wxCoord GetBestWidth() const {return 0; }
protected: protected:
wxComboControl *m_combo; wxComboControl *m_combo;
}; };

16
src/univ/combobox.cpp
View File

@@ -125,6 +125,7 @@ public:
virtual bool SetSelection(const wxString& value); virtual bool SetSelection(const wxString& value);
virtual wxControl *GetControl() { return this; } virtual wxControl *GetControl() { return this; }
virtual void OnShow(); virtual void OnShow();
virtual wxCoord wxComboListBox::GetBestWidth() const;
protected: protected:
// we shouldn't return height too big from here // we shouldn't return height too big from here
@@ -300,8 +301,15 @@ wxSize wxComboControl::DoGetBestClientSize() const
{ {
wxSize sizeBtn = m_btn->GetBestSize(), wxSize sizeBtn = m_btn->GetBestSize(),
sizeText = m_text->GetBestSize(); sizeText = m_text->GetBestSize();
wxCoord widthPopup = 0;
return wxSize(sizeText.x + g_comboMargin + sizeBtn.x, wxMax(sizeBtn.y, sizeText.y)); if (m_popup)
{
widthPopup = m_popup->GetBestWidth();
}
return wxSize(wxMax(sizeText.x + g_comboMargin + sizeBtn.x, widthPopup),
wxMax(sizeBtn.y, sizeText.y));
} }
void wxComboControl::DoMoveWindow(int x, int y, int width, int height) void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
@@ -615,6 +623,12 @@ void wxComboListBox::OnMouseMove(wxMouseEvent& event)
} }
} }
wxCoord wxComboListBox::GetBestWidth() const
{
wxSize size = wxListBox::GetBestSize();
return size.x;
}
wxSize wxComboListBox::DoGetBestClientSize() const wxSize wxComboListBox::DoGetBestClientSize() const
{ {
// don't return size too big or we risk to not fit on the screen // don't return size too big or we risk to not fit on the screen