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

got rid of ^Ms

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-12-14 00:28:47 +00:00
parent 01ec8f969d
commit 4a0f7f3f17
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gtk/gauge.cpp
View File

@ -4,7 +4,7 @@
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@ -29,28 +29,28 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range,
long style, const wxValidator& validator, const wxString& name ) long style, const wxValidator& validator, const wxString& name )
{ {
m_needParent = TRUE; m_needParent = TRUE;
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name )) !CreateBase( parent, id, pos, size, style, validator, name ))
{ {
wxFAIL_MSG( wxT("wxGauge creation failed") ); wxFAIL_MSG( wxT("wxGauge creation failed") );
return FALSE; return FALSE;
} }
m_rangeMax = range; m_rangeMax = range;
m_gaugePos = 0; m_gaugePos = 0;
m_useProgressBar = TRUE; m_useProgressBar = TRUE;
m_widget = gtk_progress_bar_new(); m_widget = gtk_progress_bar_new();
if( style & wxGA_VERTICAL) if( style & wxGA_VERTICAL)
gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP ); gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
PostCreation(); PostCreation();
Show( TRUE ); Show( TRUE );
return TRUE; return TRUE;
} }
@ -58,7 +58,7 @@ void wxGauge::SetRange( int r )
{ {
m_rangeMax = r; m_rangeMax = r;
if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax; if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax ); gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
} }
@ -66,7 +66,7 @@ void wxGauge::SetValue( int pos )
{ {
m_gaugePos = pos; m_gaugePos = pos;
if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax; if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax ); gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
} }
@ -86,4 +86,5 @@ void wxGauge::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( m_widget, m_widgetStyle );
} }
#endif #endif // wxUSE_GAUGE

23
src/gtk1/gauge.cpp
View File

@ -4,7 +4,7 @@
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@ -29,28 +29,28 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range,
long style, const wxValidator& validator, const wxString& name ) long style, const wxValidator& validator, const wxString& name )
{ {
m_needParent = TRUE; m_needParent = TRUE;
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name )) !CreateBase( parent, id, pos, size, style, validator, name ))
{ {
wxFAIL_MSG( wxT("wxGauge creation failed") ); wxFAIL_MSG( wxT("wxGauge creation failed") );
return FALSE; return FALSE;
} }
m_rangeMax = range; m_rangeMax = range;
m_gaugePos = 0; m_gaugePos = 0;
m_useProgressBar = TRUE; m_useProgressBar = TRUE;
m_widget = gtk_progress_bar_new(); m_widget = gtk_progress_bar_new();
if( style & wxGA_VERTICAL) if( style & wxGA_VERTICAL)
gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP ); gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
PostCreation(); PostCreation();
Show( TRUE ); Show( TRUE );
return TRUE; return TRUE;
} }
@ -58,7 +58,7 @@ void wxGauge::SetRange( int r )
{ {
m_rangeMax = r; m_rangeMax = r;
if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax; if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax ); gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
} }
@ -66,7 +66,7 @@ void wxGauge::SetValue( int pos )
{ {
m_gaugePos = pos; m_gaugePos = pos;
if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax; if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax ); gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
} }
@ -86,4 +86,5 @@ void wxGauge::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( m_widget, m_widgetStyle );
} }
#endif #endif // wxUSE_GAUGE