X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..572c6194d35ad2791c71aee05d6996da2761b07a:/src/gtk1/control.cpp diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index d69fae8dc1..bbd5ac2fd8 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -19,7 +19,7 @@ // wxControl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow) +IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow) wxControl::wxControl() { @@ -32,27 +32,27 @@ wxControl::wxControl( wxWindow *parent, const wxSize &size, long style, const wxString &name ) - : wxWindow( parent, id, pos, size, style, name ) { + (void)Create(parent, id, pos, size, style, name); } void wxControl::SetLabel( const wxString &label ) { m_label.Empty(); - for ( const wxChar *pc = label; *pc != T('\0'); pc++ ) + for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ ) { - if ( *pc == T('&') ) + if ( *pc == wxT('&') ) { pc++; // skip it #if 0 // it would be unused anyhow for now - kbd interface not done yet - if ( *pc != T('&') ) 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; }