X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..866592d872daa1f4e3d44948d7d3a6c90b0af9d0:/src/gtk/control.cpp?ds=sidebyside diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index 4b04d0bb37..578b12cb9f 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -13,38 +13,39 @@ #include "wx/control.h" +#include "gtk/gtkfeatures.h" + //----------------------------------------------------------------------------- // wxControl //----------------------------------------------------------------------------- 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 ) + : wxWindow( 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 != _T('\0'); pc++ ) { - if ( *pc == '&' ) - { + if ( *pc == _T('&') ) + { pc++; // skip it #if 0 // it would be unused anyhow for now - kbd interface not done yet - if ( *pc != '&' ) m_chAccel = *pc; + if ( *pc != _T('&') ) m_chAccel = *pc; #endif } m_label << *pc;