projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile-fix after modifying timercmn.cp
[wxWidgets.git]
/
src
/
gtk
/
control.cpp
diff --git
a/src/gtk/control.cpp
b/src/gtk/control.cpp
index 90b16f3d70d0677a16d9738db85cedfe2fc9b8f6..c150c147eec3f1dcd0b3f8c3cef857de35e411f4 100644
(file)
--- a/
src/gtk/control.cpp
+++ b/
src/gtk/control.cpp
@@
-13,13
+13,13
@@
#include "wx/control.h"
#include "wx/control.h"
-#include
"gtk/gtkfeatures.h"
+#include
<gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxControl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxControl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxControl,
wxWindow)
wxControl::wxControl()
{
wxControl::wxControl()
{
@@
-32,33
+32,38
@@
wxControl::wxControl( wxWindow *parent,
const wxSize &size,
long style,
const wxString &name )
const wxSize &size,
long style,
const wxString &name )
- : wxWindow( parent, id, pos, size, style, name )
-{
-}
-
-void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
{
{
+ (void)Create(parent, id, pos, size, style, name);
}
void wxControl::SetLabel( const wxString &label )
{
}
void wxControl::SetLabel( const wxString &label )
{
- m_label
= _T(""
);
- for ( const wxChar *pc = label; *pc !=
_
T('\0'); pc++ )
+ m_label
.Empty(
);
+ for ( const wxChar *pc = label; *pc !=
wx
T('\0'); pc++ )
{
{
- if ( *pc ==
_
T('&') )
+ if ( *pc ==
wx
T('&') )
{
pc++; // skip it
#if 0 // it would be unused anyhow for now - kbd interface not done yet
{
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 !=
wx
T('&') ) m_chAccel = *pc;
#endif
}
m_label << *pc;
}
}
#endif
}
m_label << *pc;
}
}
-wxString wxControl::GetLabel(
void
) const
+wxString wxControl::GetLabel() const
{
return m_label;
}
{
return m_label;
}
+wxSize wxControl::DoGetBestSize() const
+{
+ GtkRequisition req;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+ (m_widget, &req );
+
+ return wxSize(req.width, req.height);
+}
+