projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
large files support for wxFFile (patch 1077980 from Mike Wetherell)
[wxWidgets.git]
/
src
/
gtk1
/
scrolwin.cpp
diff --git
a/src/gtk1/scrolwin.cpp
b/src/gtk1/scrolwin.cpp
index de2b788576aa6772383c0f96bccfb8803639e2a7..fd31b4e024c25b015742fc1c5eff5604422661b3 100644
(file)
--- a/
src/gtk1/scrolwin.cpp
+++ b/
src/gtk1/scrolwin.cpp
@@
-28,10
+28,9
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#include "wx/scrolwin.h"
#include "wx/utils.h"
#include "wx/dcclient.h"
#include "wx/utils.h"
#include "wx/dcclient.h"
-
-#include "wx/scrolwin.h"
#include "wx/panel.h"
#include "wx/sizer.h"
#include "wx/panel.h"
#include "wx/sizer.h"
@@
-288,7
+287,7
@@
bool wxScrolledWindow::Create(wxWindow *parent,
GtkHConnectEvent();
// these handlers block mouse events to any window during scrolling such as
GtkHConnectEvent();
// these handlers block mouse events to any window during scrolling such as
- // motion events and prevent GTK and wxWi
ndow
s from fighting over where the
+ // motion events and prevent GTK and wxWi
dget
s from fighting over where the
// slider should be
gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
// slider should be
gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
@@
-453,7
+452,7
@@
wxWindow *wxScrolledWindow::GetTargetWindow() const
// Override this function if you don't want to have wxScrolledWindow
// automatically change the origin according to the scroll position.
// Override this function if you don't want to have wxScrolledWindow
// automatically change the origin according to the scroll position.
-void wxScrolledWindow::PrepareDC(wxDC& dc)
+void wxScrolledWindow::
Do
PrepareDC(wxDC& dc)
{
dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine,
-m_yScrollPosition * m_yScrollPixelsPerLine );
{
dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine,
-m_yScrollPosition * m_yScrollPixelsPerLine );
@@
-562,7
+561,7
@@
void wxScrolledWindow::Scroll( int x_pos, int y_pos )
m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
- // Just update the scrollbar, don't send any wxWi
ndow
s event
+ // Just update the scrollbar, don't send any wxWi
dget
s event
GtkHDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
GtkHConnectEvent();
GtkHDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
GtkHConnectEvent();
@@
-581,7
+580,7
@@
void wxScrolledWindow::Scroll( int x_pos, int y_pos )
m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
- // Just update the scrollbar, don't send any wxWi
ndow
s event
+ // Just update the scrollbar, don't send any wxWi
dget
s event
GtkVDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
GtkVConnectEvent();
GtkVDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
GtkVConnectEvent();
@@
-783,14
+782,14
@@
void wxScrolledWindow::SetScrollPos( int orient, int pos, bool refresh )
{
if (orient == wxHORIZONTAL)
{
{
if (orient == wxHORIZONTAL)
{
- // Just update the scrollbar, don't send any wxWi
ndow
s event
+ // Just update the scrollbar, don't send any wxWi
dget
s event
GtkHDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
GtkHConnectEvent();
}
else
{
GtkHDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
GtkHConnectEvent();
}
else
{
- // Just update the scrollbar, don't send any wxWi
ndow
s event
+ // Just update the scrollbar, don't send any wxWi
dget
s event
GtkVDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
GtkVConnectEvent();
GtkVDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
GtkVConnectEvent();