X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/gtk/control.cpp?ds=sidebyside diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index 4b04d0bb37..72e2da93ef 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -11,49 +11,77 @@ #pragma implementation "control.h" #endif +#include "wx/defs.h" + +#if wxUSE_CONTROLS + #include "wx/control.h" +#include + //----------------------------------------------------------------------------- // 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 ) +bool wxControl::Create( wxWindow *parent, + wxWindowID id, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name ) { -} + bool ret = wxWindow::Create(parent, id, pos, size, style, name); + +#if wxUSE_VALIDATORS + SetValidator(validator); +#endif -void wxControl::Command( wxCommandEvent &WXUNUSED(event) ) -{ + return ret; } 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; } +wxSize wxControl::DoGetBestSize() const +{ + // Do not return any arbitrary default value... + wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); + + GtkRequisition req; + req.width = 2; + req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) + (m_widget, &req ); + + return wxSize(req.width, req.height); +} + +#endif // wxUSE_CONTROLS +