AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for assert in 'dynarray.cpp' by Jaakko Salli.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-10-16 09:04:21 +00:00
parent d218e518d8
commit 008a265578
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
samples/widgets/bmpcombobox.cpp
View File

@ -249,7 +249,7 @@ wxSizer *BitmapComboBoxWidgetsPage::CreateSizerWithSmallTextAndLabel(const wxStr
wxControl* control = new wxStaticText(this, wxID_ANY, label); wxControl* control = new wxStaticText(this, wxID_ANY, label);
wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL); wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL);
wxTextCtrl *text = new wxTextCtrl(this, id, wxEmptyString, wxTextCtrl *text = new wxTextCtrl(this, id, wxEmptyString,
wxDefaultPosition, wxSize(50,-1), wxTE_PROCESS_ENTER); wxDefaultPosition, wxSize(50,wxDefaultCoord), wxTE_PROCESS_ENTER);
sizerRow->Add(control, 0, wxRIGHT | wxALIGN_CENTRE_VERTICAL, 5); sizerRow->Add(control, 0, wxRIGHT | wxALIGN_CENTRE_VERTICAL, 5);
sizerRow->Add(text, 1, wxFIXED_MINSIZE | wxLEFT | wxALIGN_CENTRE_VERTICAL, 5); sizerRow->Add(text, 1, wxFIXED_MINSIZE | wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
@ -298,7 +298,7 @@ void BitmapComboBoxWidgetsPage::CreateContent()
sizerRow = CreateSizerWithSmallTextAndLabel(_T("Control &height:"), sizerRow = CreateSizerWithSmallTextAndLabel(_T("Control &height:"),
BitmapComboBoxPage_ChangeHeight, BitmapComboBoxPage_ChangeHeight,
&m_textChangeHeight); &m_textChangeHeight);
m_textChangeHeight->SetSize(20, -1); m_textChangeHeight->SetSize(20, wxDefaultCoord);
sizerOptions->Add(sizerRow, 0, wxALL | wxFIXED_MINSIZE /*| wxGROW*/, 5); sizerOptions->Add(sizerRow, 0, wxALL | wxFIXED_MINSIZE /*| wxGROW*/, 5);
sizerLeft->Add(sizerOptions, 0, wxGROW | wxALIGN_CENTRE_HORIZONTAL | wxTOP, 2); sizerLeft->Add(sizerOptions, 0, wxGROW | wxALIGN_CENTRE_HORIZONTAL | wxTOP, 2);
@ -436,7 +436,7 @@ void BitmapComboBoxWidgetsPage::CreateCombo()
long h = 0; long h = 0;
m_textChangeHeight->GetValue().ToLong(&h); m_textChangeHeight->GetValue().ToLong(&h);
if ( h >= 5 ) if ( h >= 5 )
m_combobox->SetSize(-1, h); m_combobox->SetSize(wxDefaultCoord, h);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -500,8 +500,11 @@ void BitmapComboBoxWidgetsPage::OnButtonInsert(wxCommandEvent& WXUNUSED(event))
m_textInsert->SetValue(wxString::Format(_T("test item %u"), ++s_item)); m_textInsert->SetValue(wxString::Format(_T("test item %u"), ++s_item));
} }
if (m_combobox->GetSelection() >= 0) int sel = m_combobox->GetSelection();
m_combobox->Insert(s, wxNullBitmap, m_combobox->GetSelection()); if ( sel == wxNOT_FOUND )
sel = m_combobox->GetCount();
m_combobox->Insert(s, wxNullBitmap, m_combobox->GetSelection());
} }
void BitmapComboBoxWidgetsPage::OnTextChangeHeight(wxCommandEvent& WXUNUSED(event)) void BitmapComboBoxWidgetsPage::OnTextChangeHeight(wxCommandEvent& WXUNUSED(event))
@ -510,13 +513,17 @@ void BitmapComboBoxWidgetsPage::OnTextChangeHeight(wxCommandEvent& WXUNUSED(even
m_textChangeHeight->GetValue().ToLong(&h); m_textChangeHeight->GetValue().ToLong(&h);
if ( h < 5 ) if ( h < 5 )
return; return;
m_combobox->SetSize(-1, h); m_combobox->SetSize(wxDefaultCoord, h);
} }
void BitmapComboBoxWidgetsPage::OnButtonLoadFromFile(wxCommandEvent& WXUNUSED(event)) void BitmapComboBoxWidgetsPage::OnButtonLoadFromFile(wxCommandEvent& WXUNUSED(event))
{ {
wxString s; wxString s;
m_combobox->Insert(s, QueryBitmap(&s), m_combobox->GetSelection()); int sel = m_combobox->GetSelection();
if ( sel == wxNOT_FOUND )
sel = m_combobox->GetCount();
m_combobox->Insert(s, QueryBitmap(&s), sel);
} }
void BitmapComboBoxWidgetsPage::OnButtonSetFromFile(wxCommandEvent& WXUNUSED(event)) void BitmapComboBoxWidgetsPage::OnButtonSetFromFile(wxCommandEvent& WXUNUSED(event))
@ -628,11 +635,14 @@ void BitmapComboBoxWidgetsPage::OnButtonAddWidgetIcons(wxCommandEvent& WXUNUSED(
{ {
wxArrayString strings; wxArrayString strings;
int sz = 32; wxSize sz = m_combobox->GetBitmapSize();
//if ( m_chkScaleimages->GetValue() ) if ( sz.x <= 0 )
// sz = 16; {
sz.x = 32;
sz.y = 32;
}
wxImageList images(sz, sz); wxImageList images(sz.x, sz.y);
LoadWidgetImages(&strings, &images); LoadWidgetImages(&strings, &images);
@ -731,6 +741,13 @@ wxBitmap BitmapComboBoxWidgetsPage::LoadBitmap(const wxString& filepath)
// Get size of existing images in list // Get size of existing images in list
wxSize foundSize = m_combobox->GetBitmapSize(); wxSize foundSize = m_combobox->GetBitmapSize();
// Have some reasonable maximum size
if ( foundSize.x <= 0 )
{
foundSize.x = 256;
foundSize.y = 256;
}
wxImage image(filepath); wxImage image(filepath);
if ( image.Ok() ) if ( image.Ok() )
{ {
@ -766,9 +783,9 @@ wxBitmap BitmapComboBoxWidgetsPage::LoadBitmap(const wxString& WXUNUSED(filepath
wxBitmap BitmapComboBoxWidgetsPage::QueryBitmap(wxString* pStr) wxBitmap BitmapComboBoxWidgetsPage::QueryBitmap(wxString* pStr)
{ {
wxString filepath = wxFileSelector(wxT("Choose image file"), wxString filepath = wxFileSelector(wxT("Choose image file"),
wxT(""), wxEmptyString,
wxT(""), wxEmptyString,
wxT(""), wxEmptyString,
wxT("*.*"), wxT("*.*"),
wxFD_OPEN | wxFD_FILE_MUST_EXIST, wxFD_OPEN | wxFD_FILE_MUST_EXIST,
this); this);

2
src/generic/bmpcboxg.cpp
View File

@ -264,6 +264,8 @@ int wxBitmapComboBox::DoInsertWithImage(const wxString& item,
const wxBitmap& image, const wxBitmap& image,
unsigned int pos) unsigned int pos)
{ {
wxCHECK_MSG( IsValidInsert(pos), wxNOT_FOUND, wxT("invalid item index") );
if ( !DoInsertBitmap(image, pos) ) if ( !DoInsertBitmap(image, pos) )
return wxNOT_FOUND; return wxNOT_FOUND;