Tried to prevent scrollbars from scrolling as
per MSW, didn't work. Added DeleteAllItems event and test to listctrl. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1577,54 +1577,6 @@ static void gtk_window_hscroll_callback( GtkAdjustment *adjust, wxWindow *win )
|
||||
win->GetEventHandler()->ProcessEvent( event );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// "changed" from m_vAdjust
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
/*
|
||||
static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
|
||||
{
|
||||
DEBUG_MAIN_THREAD
|
||||
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
if (g_blockEventsOnDrag) return;
|
||||
if (!win->m_hasVMT) return;
|
||||
|
||||
wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
|
||||
int value = (int)(win->m_vAdjust->value+0.5);
|
||||
|
||||
wxScrollWinEvent event( command, value, wxVERTICAL );
|
||||
event.SetEventObject( win );
|
||||
win->GetEventHandler()->ProcessEvent( event );
|
||||
}
|
||||
*/
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// "changed" from m_hAdjust
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
/*
|
||||
static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
|
||||
{
|
||||
DEBUG_MAIN_THREAD
|
||||
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
if (g_blockEventsOnDrag) return;
|
||||
if (!win->m_hasVMT) return;
|
||||
|
||||
wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
|
||||
int value = (int)(win->m_hAdjust->value+0.5);
|
||||
|
||||
wxScrollWinEvent event( command, value, wxHORIZONTAL );
|
||||
event.SetEventObject( win );
|
||||
win->GetEventHandler()->ProcessEvent( event );
|
||||
}
|
||||
*/
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// "button_press_event" from scrollbar
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -2119,13 +2071,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
|
||||
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
|
||||
(GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
|
||||
|
||||
/*
|
||||
gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
|
||||
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
|
||||
gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed",
|
||||
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
|
||||
*/
|
||||
|
||||
gtk_widget_show( m_wxwindow );
|
||||
|
||||
if (m_parent)
|
||||
@@ -3334,33 +3279,9 @@ void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
}
|
||||
|
||||
if (orient == wxHORIZONTAL)
|
||||
{
|
||||
/*
|
||||
gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
|
||||
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
|
||||
*/
|
||||
|
||||
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
|
||||
|
||||
/*
|
||||
gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
|
||||
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
|
||||
*/
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
|
||||
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
|
||||
*/
|
||||
|
||||
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
|
||||
|
||||
/*
|
||||
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "changed",
|
||||
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
|
||||
|
Reference in New Issue
Block a user