// wxControl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
-wxControl::wxControl(void)
+wxControl::wxControl()
{
m_needParent = TRUE;
}
-wxControl::wxControl( wxWindow *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- long style, const wxString &name ) :
- wxWindow( parent, id, pos, size, style, name )
-{
-}
-
-void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
+wxControl::wxControl( wxWindow *parent,
+ wxWindowID id,
+ const wxPoint &pos,
+ const wxSize &size,
+ long style,
+ const wxString &name )
{
+ (void)Create(parent, id, pos, size, style, name);
}
void wxControl::SetLabel( const wxString &label )
{
- m_label = "";
- for ( const char *pc = label; *pc != '\0'; pc++ )
+ m_label.Empty();
+ for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ )
{
- if ( *pc == '&' )
- {
+ if ( *pc == wxT('&') )
+ {
pc++; // skip it
#if 0 // it would be unused anyhow for now - kbd interface not done yet
- if ( *pc != '&' ) m_chAccel = *pc;
+ if ( *pc != wxT('&') ) m_chAccel = *pc;
#endif
}
m_label << *pc;
}
}
-wxString wxControl::GetLabel(void) const
+wxString wxControl::GetLabel() const
{
return m_label;
}