projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxDateTime progress: DST compuation, weekday computation, day-in-year and week
[wxWidgets.git]
/
src
/
gtk
/
control.cpp
diff --git
a/src/gtk/control.cpp
b/src/gtk/control.cpp
index 3c7f89d95b8af92647bf133ba04f7b71d9a93bdd..c150c147eec3f1dcd0b3f8c3cef857de35e411f4 100644
(file)
--- a/
src/gtk/control.cpp
+++ b/
src/gtk/control.cpp
@@
-2,9
+2,8
@@
// Name: control.cpp
// Purpose:
// Author: Robert Roebling
// Name: control.cpp
// Purpose:
// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id: $Id$
+// Copyright: (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-14,47
+13,57
@@
#include "wx/control.h"
#include "wx/control.h"
+#include <gtk/gtk.h>
+
//-----------------------------------------------------------------------------
// wxControl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxControl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
-
-wxControl::wxControl(void)
-{
- m_needParent = TRUE;
-};
+IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
-wxControl::wxControl( wxWindow *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- long style, const wxString &name ) :
- wxWindow( parent, id, pos, size, style, name )
+wxControl::wxControl()
{
{
-};
+ m_needParent = TRUE;
+}
-void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
+wxControl::wxControl( wxWindow *parent,
+ wxWindowID id,
+ const wxPoint &pos,
+ const wxSize &size,
+ long style,
+ const wxString &name )
{
{
-};
+ (void)Create(parent, id, pos, size, style, name);
+}
void wxControl::SetLabel( const wxString &label )
{
void wxControl::SetLabel( const wxString &label )
{
- for ( const char *pc = label; *pc != '\0'; pc++ ) {
- if ( *pc == '&' ) {
- pc++; // skip it
+ m_label.Empty();
+ for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ )
+ {
+ if ( *pc == wxT('&') )
+ {
+ pc++; // skip it
#if 0 // it would be unused anyhow for now - kbd interface not done yet
#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
#endif
+ }
+ m_label << *pc;
}
}
+}
- 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);
+}