Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This seems to be compiling.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-14 20:23:46 +00:00
parent 3e473156c6
commit 3bce750983
6 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/button.cpp
View File

@@ -71,10 +71,10 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
SetValidator( validator ); SetValidator( validator );
m_widget = gtk_button_new_with_label( m_label ); m_widget = gtk_button_new_with_label( m_label.mbc_str() );
SetLabel(label); SetLabel(label);
if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label ); if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label.mbc_str() );
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
@@ -106,16 +106,16 @@ void wxButton::SetDefault(void)
void wxButton::SetLabel( const wxString &label ) void wxButton::SetLabel( const wxString &label )
{ {
wxCHECK_RET( m_widget != NULL, "invalid button" ); wxCHECK_RET( m_widget != NULL, _T("invalid button") );
wxControl::SetLabel( label ); wxControl::SetLabel( label );
gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() ); gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() );
} }
void wxButton::Enable( bool enable ) void wxButton::Enable( bool enable )
{ {
wxCHECK_RET( m_widget != NULL, "invalid button" ); wxCHECK_RET( m_widget != NULL, _T("invalid button") );
wxControl::Enable( enable ); wxControl::Enable( enable );
@@ -128,5 +128,3 @@ void wxButton::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( m_widget, m_widgetStyle );
gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
} }

16
src/gtk/checkbox.cpp
View File

@@ -81,7 +81,7 @@ bool wxCheckBox::Create(wxWindow *parent,
// left of it // left of it
m_widgetCheckbox = gtk_check_button_new(); m_widgetCheckbox = gtk_check_button_new();
m_widgetLabel = gtk_label_new(m_label); m_widgetLabel = gtk_label_new(m_label.mbc_str());
gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
m_widget = gtk_hbox_new(FALSE, 0); m_widget = gtk_hbox_new(FALSE, 0);
@@ -94,7 +94,7 @@ bool wxCheckBox::Create(wxWindow *parent,
} }
else else
{ {
m_widgetCheckbox = gtk_check_button_new_with_label( m_label ); m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child; m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
m_widget = m_widgetCheckbox; m_widget = m_widgetCheckbox;
} }
@@ -103,7 +103,7 @@ bool wxCheckBox::Create(wxWindow *parent,
if (newSize.x == -1) if (newSize.x == -1)
{ {
newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font, newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
m_label ); m_label.mbc_str() );
} }
if (newSize.y == -1) if (newSize.y == -1)
newSize.y = 26; newSize.y = 26;
@@ -135,7 +135,7 @@ bool wxCheckBox::Create(wxWindow *parent,
void wxCheckBox::SetValue( bool state ) void wxCheckBox::SetValue( bool state )
{ {
wxCHECK_RET( m_widgetCheckbox != NULL, "invalid checkbox" ); wxCHECK_RET( m_widgetCheckbox != NULL, _T("invalid checkbox") );
if ( state == GetValue() ) if ( state == GetValue() )
return; return;
@@ -149,23 +149,23 @@ void wxCheckBox::SetValue( bool state )
bool wxCheckBox::GetValue() const bool wxCheckBox::GetValue() const
{ {
wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, "invalid checkbox" ); wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, _T("invalid checkbox") );
return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active; return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
} }
void wxCheckBox::SetLabel( const wxString& label ) void wxCheckBox::SetLabel( const wxString& label )
{ {
wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" ); wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
wxControl::SetLabel( label ); wxControl::SetLabel( label );
gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel() ); gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
} }
void wxCheckBox::Enable( bool enable ) void wxCheckBox::Enable( bool enable )
{ {
wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" ); wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
wxControl::Enable( enable ); wxControl::Enable( enable );

8
src/gtk/control.cpp
View File

@@ -39,14 +39,14 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
void wxControl::SetLabel( const wxString &label ) void wxControl::SetLabel( const wxString &label )
{ {
m_label = ""; m_label = _T("");
for ( const char *pc = label; *pc != '\0'; pc++ ) for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
{ {
if ( *pc == '&' ) if ( *pc == _T('&') )
{ {
pc++; // skip it 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;

12
src/gtk1/button.cpp
View File

@@ -71,10 +71,10 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
SetValidator( validator ); SetValidator( validator );
m_widget = gtk_button_new_with_label( m_label ); m_widget = gtk_button_new_with_label( m_label.mbc_str() );
SetLabel(label); SetLabel(label);
if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label ); if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label.mbc_str() );
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
@@ -106,16 +106,16 @@ void wxButton::SetDefault(void)
void wxButton::SetLabel( const wxString &label ) void wxButton::SetLabel( const wxString &label )
{ {
wxCHECK_RET( m_widget != NULL, "invalid button" ); wxCHECK_RET( m_widget != NULL, _T("invalid button") );
wxControl::SetLabel( label ); wxControl::SetLabel( label );
gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() ); gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel().mbc_str() );
} }
void wxButton::Enable( bool enable ) void wxButton::Enable( bool enable )
{ {
wxCHECK_RET( m_widget != NULL, "invalid button" ); wxCHECK_RET( m_widget != NULL, _T("invalid button") );
wxControl::Enable( enable ); wxControl::Enable( enable );
@@ -128,5 +128,3 @@ void wxButton::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( m_widget, m_widgetStyle );
gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
} }

16
src/gtk1/checkbox.cpp
View File

@@ -81,7 +81,7 @@ bool wxCheckBox::Create(wxWindow *parent,
// left of it // left of it
m_widgetCheckbox = gtk_check_button_new(); m_widgetCheckbox = gtk_check_button_new();
m_widgetLabel = gtk_label_new(m_label); m_widgetLabel = gtk_label_new(m_label.mbc_str());
gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
m_widget = gtk_hbox_new(FALSE, 0); m_widget = gtk_hbox_new(FALSE, 0);
@@ -94,7 +94,7 @@ bool wxCheckBox::Create(wxWindow *parent,
} }
else else
{ {
m_widgetCheckbox = gtk_check_button_new_with_label( m_label ); m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child; m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child;
m_widget = m_widgetCheckbox; m_widget = m_widgetCheckbox;
} }
@@ -103,7 +103,7 @@ bool wxCheckBox::Create(wxWindow *parent,
if (newSize.x == -1) if (newSize.x == -1)
{ {
newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font, newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
m_label ); m_label.mbc_str() );
} }
if (newSize.y == -1) if (newSize.y == -1)
newSize.y = 26; newSize.y = 26;
@@ -135,7 +135,7 @@ bool wxCheckBox::Create(wxWindow *parent,
void wxCheckBox::SetValue( bool state ) void wxCheckBox::SetValue( bool state )
{ {
wxCHECK_RET( m_widgetCheckbox != NULL, "invalid checkbox" ); wxCHECK_RET( m_widgetCheckbox != NULL, _T("invalid checkbox") );
if ( state == GetValue() ) if ( state == GetValue() )
return; return;
@@ -149,23 +149,23 @@ void wxCheckBox::SetValue( bool state )
bool wxCheckBox::GetValue() const bool wxCheckBox::GetValue() const
{ {
wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, "invalid checkbox" ); wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, _T("invalid checkbox") );
return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active; return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
} }
void wxCheckBox::SetLabel( const wxString& label ) void wxCheckBox::SetLabel( const wxString& label )
{ {
wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" ); wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
wxControl::SetLabel( label ); wxControl::SetLabel( label );
gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel() ); gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
} }
void wxCheckBox::Enable( bool enable ) void wxCheckBox::Enable( bool enable )
{ {
wxCHECK_RET( m_widgetLabel != NULL, "invalid checkbox" ); wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") );
wxControl::Enable( enable ); wxControl::Enable( enable );

8
src/gtk1/control.cpp
View File

@@ -39,14 +39,14 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
void wxControl::SetLabel( const wxString &label ) void wxControl::SetLabel( const wxString &label )
{ {
m_label = ""; m_label = _T("");
for ( const char *pc = label; *pc != '\0'; pc++ ) for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
{ {
if ( *pc == '&' ) if ( *pc == _T('&') )
{ {
pc++; // skip it 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;