projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Too quick a trigger finger first time. Compile error fixed.
[wxWidgets.git]
/
src
/
gtk1
/
control.cpp
diff --git
a/src/gtk1/control.cpp
b/src/gtk1/control.cpp
index b369c4d8c11ac1527db2a57fe5de03b41f440fde..ca1b3a199d36c5f2d8a78ca9aed53876aa30e73d 100644
(file)
--- a/
src/gtk1/control.cpp
+++ b/
src/gtk1/control.cpp
@@
-26,30
+26,23
@@
wxControl::wxControl()
m_needParent = TRUE;
}
m_needParent = TRUE;
}
-
wxControl::wxControl
( wxWindow *parent,
+
bool wxControl::Create
( wxWindow *parent,
wxWindowID id,
const wxPoint &pos,
const wxSize &size,
long style,
wxWindowID id,
const wxPoint &pos,
const wxSize &size,
long style,
+ const wxValidator& validator,
const wxString &name )
{
const wxString &name )
{
- (void)Create(parent, id, pos, size, style, name);
-}
-
+ bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+
#if wxUSE_VALIDATORS
#if wxUSE_VALIDATORS
-wxControl::wxControl( wxWindow *parent,
- wxWindowID id,
- const wxPoint &pos,
- const wxSize &size,
- long style,
- const wxValidator& validator,
- const wxString &name)
-{
- (void)Create(parent, id, pos, size, style, name);
SetValidator(validator);
SetValidator(validator);
-}
#endif
#endif
+ return ret;
+}
+
void wxControl::SetLabel( const wxString &label )
{
m_label.Empty();
void wxControl::SetLabel( const wxString &label )
{
m_label.Empty();
@@
-74,8
+67,13
@@
wxString wxControl::GetLabel() const
wxSize wxControl::DoGetBestSize() const
{
wxSize wxControl::DoGetBestSize() const
{
+ // Do not return any arbitrary default value...
+ wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
+
GtkRequisition req;
GtkRequisition req;
- (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+ 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);
(m_widget, &req );
return wxSize(req.width, req.height);