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

Initialized the controls on the widgets spinbutton page

Browse Source 
and checked for NULL in one of the event handlers, since
on the Mac the event handler may be called before the
control is properly initialized
Tested for an empty string in Mac's textctrl.cpp
else we get a crash if there is nothing in the text control


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2002-05-14 11:28:13 +00:00
parent 44a5856d5e
commit 59b9edf0b3
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
samples/widgets/spinbtn.cpp
View File

@ -165,6 +165,13 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
wxImageList *imaglist)
: WidgetsPage(notebook)
{
m_chkVert = NULL;
m_chkWrap = NULL;
m_spinbtn = NULL;
m_spinctrl = NULL;
m_textValue = NULL;
m_textMin = NULL;
m_textMax = NULL;
imaglist->Add(wxBitmap(spinbtn_xpm));
// init everything
@ -410,6 +417,8 @@ void SpinBtnWidgetsPage::OnSpinBtnDown(wxCommandEvent& event)
void SpinBtnWidgetsPage::OnSpinCtrl(wxCommandEvent& event)
{
if (!m_spinctrl)
return;
int value = event.GetInt();
wxASSERT_MSG( value == m_spinctrl->GetValue(),
@ -417,4 +426,4 @@ void SpinBtnWidgetsPage::OnSpinCtrl(wxCommandEvent& event)
wxLogMessage(_T("Spin control value changed, now %d"), value);
}
#endif
#endif

3
src/mac/carbon/textctrl.cpp
View File

@ -816,7 +816,8 @@ wxString wxTextCtrl::GetValue() const
else
{
actualsize = GetHandleSize( theText ) ;
strncpy( wxBuffer , *theText , actualsize ) ;
if (actualsize != 0)
strncpy( wxBuffer , *theText , actualsize ) ;
DisposeHandle( theText ) ;
}
}

3
src/mac/textctrl.cpp
View File

@ -816,7 +816,8 @@ wxString wxTextCtrl::GetValue() const
else
{
actualsize = GetHandleSize( theText ) ;
strncpy( wxBuffer , *theText , actualsize ) ;
if (actualsize != 0)
strncpy( wxBuffer , *theText , actualsize ) ;
DisposeHandle( theText ) ;
}
}