projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile fixes,
[wxWidgets.git]
/
src
/
gtk1
/
control.cpp
diff --git
a/src/gtk1/control.cpp
b/src/gtk1/control.cpp
index 61bab59ecf0d26ea217725e7d3661ee0fa9a616b..578b12cb9fcdd8f3e7bceea2f76549ffd14934e6 100644
(file)
--- a/
src/gtk1/control.cpp
+++ b/
src/gtk1/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,48
+13,48
@@
#include "wx/control.h"
#include "wx/control.h"
+#include "gtk/gtkfeatures.h"
+
//-----------------------------------------------------------------------------
// wxControl
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
//-----------------------------------------------------------------------------
// wxControl
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
-wxControl::wxControl(void)
-{
- 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 )
+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 )
+ : wxWindow( parent, id, pos, size, style, name )
{
}
void wxControl::SetLabel( const wxString &label )
{
{
}
void wxControl::SetLabel( const wxString &label )
{
- m_label = "";
- for ( const char *pc = label; *pc != '\0'; pc++ ) {
- if ( *pc == '&' ) {
- pc++; // skip it
+ m_label.Empty();
+ for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
+ {
+ if ( *pc == _T('&') )
+ {
+ 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 != _T('&') ) m_chAccel = *pc;
#endif
#endif
+ }
+ m_label << *pc;
}
}
-
- m_label << *pc;
- }
}
wxString wxControl::GetLabel(void) const
{
}
wxString wxControl::GetLabel(void) const
{
- return m_label;
+
return m_label;
}
}
-