projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added wxSP_SASH_AQUA style
[wxWidgets.git]
/
src
/
gtk
/
scrolbar.cpp
diff --git
a/src/gtk/scrolbar.cpp
b/src/gtk/scrolbar.cpp
index 1b40fc530bce037037e56f0060fbd8d1c6375cf9..df1cba34af5e367a15cfcc0e25fe187dc8683dfa 100644
(file)
--- a/
src/gtk/scrolbar.cpp
+++ b/
src/gtk/scrolbar.cpp
@@
-1,10
+1,10
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: scrolbar.cpp
+// Name: s
rc/gtk/s
crolbar.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence:
wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@
-12,10
+12,12
@@
#pragma implementation "scrolbar.h"
#endif
#pragma implementation "scrolbar.h"
#endif
-#include "wx/
scrolbar
.h"
+#include "wx/
defs
.h"
#if wxUSE_SCROLLBAR
#if wxUSE_SCROLLBAR
+#include "wx/scrolbar.h"
+
#include "wx/utils.h"
#include <math.h>
#include "wx/utils.h"
#include <math.h>
@@
-63,7
+65,8
@@
static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLL_PAGEDOWN;
else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLL_PAGEDOWN;
- int value = (int)ceil(adjust->value);
+ double dvalue = adjust->value;
+ int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
@@
-109,12
+112,11
@@
static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
if (win->m_isScrolling)
{
if (win->m_isScrolling)
{
- wxEventType command = wxEVT_SCROLL_THUMB
TRACK
;
+ wxEventType command = wxEVT_SCROLL_THUMB
RELEASE
;
int value = (int)ceil(win->m_adjust->value);
int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
wxScrollEvent event( command, value, dir );
int value = (int)ceil(win->m_adjust->value);
int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
wxScrollEvent event( command, value, dir );
- event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
}
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
}
@@
-130,7
+132,7
@@
static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-wxScrollBar::~wxScrollBar(
void
)
+wxScrollBar::~wxScrollBar()
{
}
{
}
@@
-145,7
+147,7
@@
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxScrollBar creation failed") );
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxScrollBar creation failed") );
- return FALSE;
+
return FALSE;
}
m_oldPos = 0.0;
}
m_oldPos = 0.0;
@@
-183,9
+185,10
@@
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
return TRUE;
}
return TRUE;
}
-int wxScrollBar::GetThumbPosition(
void
) const
+int wxScrollBar::GetThumbPosition() const
{
{
- return (int)(m_adjust->value+0.5);
+ double val = m_adjust->value;
+ return (int)(val < 0 ? val - 0.5 : val + 0.5);
}
int wxScrollBar::GetThumbSize() const
}
int wxScrollBar::GetThumbSize() const
@@
-253,7
+256,7
@@
void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
}
/* Backward compatibility */
}
/* Backward compatibility */
-int wxScrollBar::GetValue(
void
) const
+int wxScrollBar::GetValue() const
{
return GetThumbPosition();
}
{
return GetThumbPosition();
}