Typos fixed.
Corrected children's deletion (strict now). Corrected scrolled window's setup upon startup (with/without scrollbars etc.) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -164,9 +164,7 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
|
||||
gtk_signal_connect( GTK_OBJECT(m_widget), "released",
|
||||
GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
|
||||
|
||||
m_parent->AddChild( this );
|
||||
|
||||
m_parent->InsertChild( this );
|
||||
m_parent->DoAddChild( this );
|
||||
|
||||
PostCreation();
|
||||
|
||||
|
@@ -129,7 +129,7 @@ void wxRadioButton::SetValue( bool val )
|
||||
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_theOtherRadioButtton), TRUE );
|
||||
}
|
||||
|
||||
bool wxRadioButton::GetValue(void) const
|
||||
bool wxRadioButton::GetValue() const
|
||||
{
|
||||
wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobutton") );
|
||||
|
||||
|
@@ -2676,15 +2676,10 @@ void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
m_vAdjust->page_size = fthumb;
|
||||
}
|
||||
|
||||
if (m_wxwindow->window)
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
|
||||
else
|
||||
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
|
||||
|
||||
gtk_widget_set_usize( m_widget, m_width, m_height );
|
||||
}
|
||||
if (orient == wxHORIZONTAL)
|
||||
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
|
||||
else
|
||||
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
|
||||
}
|
||||
|
||||
void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
|
||||
@@ -2714,7 +2709,7 @@ void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
|
||||
m_vAdjust->value = fpos;
|
||||
}
|
||||
|
||||
if (!m_isScrolling)
|
||||
if (!m_isScrolling) /* prevent recursion */
|
||||
{
|
||||
if (m_wxwindow->window)
|
||||
{
|
||||
|
Reference in New Issue
Block a user