AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A couple more.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven 1999-04-15 13:24:06 +00:00
parent b019151f0b
commit 9f15c5febf
6 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/spinbutt.cpp
View File

@ -121,28 +121,28 @@ wxSpinButton::~wxSpinButton()
int wxSpinButton::GetMin() const int wxSpinButton::GetMin() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
return (int)ceil(m_adjust->lower); return (int)ceil(m_adjust->lower);
} }
int wxSpinButton::GetMax() const int wxSpinButton::GetMax() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
return (int)ceil(m_adjust->upper); return (int)ceil(m_adjust->upper);
} }
int wxSpinButton::GetValue() const int wxSpinButton::GetValue() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
return (int)ceil(m_adjust->value); return (int)ceil(m_adjust->value);
} }
void wxSpinButton::SetValue( int value ) void wxSpinButton::SetValue( int value )
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
float fpos = (float)value; float fpos = (float)value;
m_oldPos = fpos; m_oldPos = fpos;
@ -155,7 +155,7 @@ void wxSpinButton::SetValue( int value )
void wxSpinButton::SetRange(int minVal, int maxVal) void wxSpinButton::SetRange(int minVal, int maxVal)
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
float fmin = (float)minVal; float fmin = (float)minVal;
float fmax = (float)maxVal; float fmax = (float)maxVal;
@ -174,7 +174,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
m_width = 16; m_width = 16;
gtk_widget_set_usize( m_widget, m_width, m_height ); gtk_widget_set_usize( m_widget, m_width, m_height );
@ -201,5 +201,3 @@ wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
wxScrollEvent(commandType, id) wxScrollEvent(commandType, id)
{ {
} }

5
src/gtk/statbox.cpp
View File

@ -43,7 +43,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
m_isStaticBox = TRUE; m_isStaticBox = TRUE;
m_widget = gtk_frame_new(m_label); m_widget = gtk_frame_new(m_label.mbc_str());
m_parent->AddChild( this ); m_parent->AddChild( this );
@ -66,7 +66,7 @@ void wxStaticBox::SetLabel( const wxString &label )
{ {
wxControl::SetLabel( label ); wxControl::SetLabel( label );
GtkFrame *frame = GTK_FRAME( m_widget ); GtkFrame *frame = GTK_FRAME( m_widget );
gtk_frame_set_label( frame, GetLabel() ); gtk_frame_set_label( frame, GetLabel().mbc_str() );
} }
void wxStaticBox::ApplyWidgetStyle() void wxStaticBox::ApplyWidgetStyle()
@ -74,4 +74,3 @@ void wxStaticBox::ApplyWidgetStyle()
SetWidgetStyle(); SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( m_widget, m_widgetStyle );
} }

4
src/gtk/stattext.cpp
View File

@ -57,7 +57,7 @@ bool wxStaticText::Create(wxWindow *parent,
// because the label is not yet created and because SetLabel() has a side // because the label is not yet created and because SetLabel() has a side
// effect of changing the control size which might not be desirable // effect of changing the control size which might not be desirable
wxControl::SetLabel(label); wxControl::SetLabel(label);
m_widget = gtk_label_new( m_label ); m_widget = gtk_label_new( m_label.mbc_str() );
GtkJustification justify; GtkJustification justify;
if ( style & wxALIGN_CENTER ) if ( style & wxALIGN_CENTER )
@ -103,7 +103,7 @@ void wxStaticText::SetLabel( const wxString &label )
{ {
wxControl::SetLabel(label); wxControl::SetLabel(label);
gtk_label_set( GTK_LABEL(m_widget), m_label ); gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
// adjust the label size to the new label // adjust the label size to the new label

14
src/gtk1/spinbutt.cpp
View File

@ -121,28 +121,28 @@ wxSpinButton::~wxSpinButton()
int wxSpinButton::GetMin() const int wxSpinButton::GetMin() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
return (int)ceil(m_adjust->lower); return (int)ceil(m_adjust->lower);
} }
int wxSpinButton::GetMax() const int wxSpinButton::GetMax() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
return (int)ceil(m_adjust->upper); return (int)ceil(m_adjust->upper);
} }
int wxSpinButton::GetValue() const int wxSpinButton::GetValue() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") );
return (int)ceil(m_adjust->value); return (int)ceil(m_adjust->value);
} }
void wxSpinButton::SetValue( int value ) void wxSpinButton::SetValue( int value )
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
float fpos = (float)value; float fpos = (float)value;
m_oldPos = fpos; m_oldPos = fpos;
@ -155,7 +155,7 @@ void wxSpinButton::SetValue( int value )
void wxSpinButton::SetRange(int minVal, int maxVal) void wxSpinButton::SetRange(int minVal, int maxVal)
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
float fmin = (float)minVal; float fmin = (float)minVal;
float fmax = (float)maxVal; float fmax = (float)maxVal;
@ -174,7 +174,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") );
m_width = 16; m_width = 16;
gtk_widget_set_usize( m_widget, m_width, m_height ); gtk_widget_set_usize( m_widget, m_width, m_height );
@ -201,5 +201,3 @@ wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
wxScrollEvent(commandType, id) wxScrollEvent(commandType, id)
{ {
} }

5
src/gtk1/statbox.cpp
View File

@ -43,7 +43,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
m_isStaticBox = TRUE; m_isStaticBox = TRUE;
m_widget = gtk_frame_new(m_label); m_widget = gtk_frame_new(m_label.mbc_str());
m_parent->AddChild( this ); m_parent->AddChild( this );
@ -66,7 +66,7 @@ void wxStaticBox::SetLabel( const wxString &label )
{ {
wxControl::SetLabel( label ); wxControl::SetLabel( label );
GtkFrame *frame = GTK_FRAME( m_widget ); GtkFrame *frame = GTK_FRAME( m_widget );
gtk_frame_set_label( frame, GetLabel() ); gtk_frame_set_label( frame, GetLabel().mbc_str() );
} }
void wxStaticBox::ApplyWidgetStyle() void wxStaticBox::ApplyWidgetStyle()
@ -74,4 +74,3 @@ void wxStaticBox::ApplyWidgetStyle()
SetWidgetStyle(); SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( m_widget, m_widgetStyle );
} }

4
src/gtk1/stattext.cpp
View File

@ -57,7 +57,7 @@ bool wxStaticText::Create(wxWindow *parent,
// because the label is not yet created and because SetLabel() has a side // because the label is not yet created and because SetLabel() has a side
// effect of changing the control size which might not be desirable // effect of changing the control size which might not be desirable
wxControl::SetLabel(label); wxControl::SetLabel(label);
m_widget = gtk_label_new( m_label ); m_widget = gtk_label_new( m_label.mbc_str() );
GtkJustification justify; GtkJustification justify;
if ( style & wxALIGN_CENTER ) if ( style & wxALIGN_CENTER )
@ -103,7 +103,7 @@ void wxStaticText::SetLabel( const wxString &label )
{ {
wxControl::SetLabel(label); wxControl::SetLabel(label);
gtk_label_set( GTK_LABEL(m_widget), m_label ); gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
// adjust the label size to the new label // adjust the label size to the new label