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

fix crash in BitmapComboBoxWidgetsPage under wxUniv

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-17 22:44:49 +00:00
parent f696015cf1
commit 73545b1290
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/widgets/bmpcombobox.cpp
View File

@@ -240,10 +240,15 @@ BitmapComboBoxWidgetsPage::BitmapComboBoxWidgetsPage(WidgetsBookCtrl *book,
{ {
// init everything // init everything
m_chkSort = m_chkSort =
m_chkReadonly = (wxCheckBox *)NULL; m_chkReadonly = NULL;
m_combobox = (wxBitmapComboBox *)NULL; m_combobox = NULL;
m_sizerCombo = (wxSizer *)NULL; m_sizerCombo = NULL;
m_textInsert =
m_textChangeHeight =
m_textChange =
m_textDelete = NULL;
} }
// create a sizer containing a label and a small text ctrl // create a sizer containing a label and a small text ctrl
@@ -273,7 +278,6 @@ void BitmapComboBoxWidgetsPage::CreateContent()
miscellaneous combobox operations and the pane containing the combobox miscellaneous combobox operations and the pane containing the combobox
itself to the right itself to the right
*/ */
//wxTextCtrl *text;
wxSizer *sizerRow; wxSizer *sizerRow;
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
@@ -513,6 +517,7 @@ void BitmapComboBoxWidgetsPage::OnButtonInsert(wxCommandEvent& WXUNUSED(event))
void BitmapComboBoxWidgetsPage::OnTextChangeHeight(wxCommandEvent& WXUNUSED(event)) void BitmapComboBoxWidgetsPage::OnTextChangeHeight(wxCommandEvent& WXUNUSED(event))
{ {
long h = 0; long h = 0;
if ( m_textChangeHeight )
m_textChangeHeight->GetValue().ToLong(&h); m_textChangeHeight->GetValue().ToLong(&h);
if ( h < 5 ) if ( h < 5 )
return; return;