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

Changed instal path for setup.h

Browse Source 
changed socket stream inheritance to virtual
  removed a few more warnings from the samples
  corrected thread habdling in configure.in
  removed dancing sliders from scrollbars
  corrected notebook send event bug and added it
   the controls sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-09-12 17:18:12 +00:00
parent e55ad60e19
commit cb43b372fb
24 changed files with 441 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/gtk/scrolbar.cpp
View File

@@ -61,6 +61,34 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
*/
}
//-----------------------------------------------------------------------------
// "button_press_event" from slider
//-----------------------------------------------------------------------------
static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win )
{
if (gdk_event->window != widget->slider) return FALSE;
win->m_isScrolling = TRUE;
return FALSE;
}
//-----------------------------------------------------------------------------
// "button_release_event" from slider
//-----------------------------------------------------------------------------
static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win )
{
if (gdk_event->window != widget->slider) return FALSE;
gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
win->m_isScrolling = FALSE;
return FALSE;
}
//-----------------------------------------------------------------------------
// wxScrollBar
//-----------------------------------------------------------------------------
@@ -93,6 +121,12 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
(GtkSignalFunc) gtk_scrollbar_callback, (gpointer) this );
gtk_signal_connect( GTK_OBJECT(m_widget), "button_press_event",
(GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
gtk_signal_connect( GTK_OBJECT(m_widget), "button_release_event",
(GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
PostCreation();
Show( TRUE );
@@ -126,25 +160,29 @@ void wxScrollBar::SetPosition( int viewStart )
m_oldPos = fpos;
if (fabs(fpos-m_adjust->value) < 0.2) return;
m_adjust->value = fpos;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
if (!m_isScrolling)
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
}
void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
bool WXUNUSED(refresh) )
{
float fpos = (float)position;
m_oldPos = fpos;
float frange = (float)range;
float fthumb = (float)thumbSize;
float fpage = (float)pageSize;
if ((fabs(fpos-m_adjust->value) < 0.2) &&
(fabs(frange-m_adjust->upper) < 0.2) &&
if ((fabs(frange-m_adjust->upper) < 0.2) &&
(fabs(fthumb-m_adjust->page_size) < 0.2) &&
(fabs(fpage-m_adjust->page_increment) < 0.2))
return;
{
SetPosition( position );
return;
}
m_oldPos = fpos;
m_adjust->lower = 0.0;
m_adjust->upper = frange;
m_adjust->value = fpos;