projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix off by 1 error in GetTextRaw() (#4317)
[wxWidgets.git]
/
src
/
univ
/
scrthumb.cpp
diff --git
a/src/univ/scrthumb.cpp
b/src/univ/scrthumb.cpp
index c5a2460e92c5460fbf3b9f618746bc47a12809c9..a6c0e02284242b2e89e1331428ddcc1a48d91407 100644
(file)
--- a/
src/univ/scrthumb.cpp
+++ b/
src/univ/scrthumb.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: univ/scrthumb.cpp
+// Name:
src/
univ/scrthumb.cpp
// Purpose: wxScrollThumb and related classes
// Author: Vadim Zeitlin
// Modified by:
// Purpose: wxScrollThumb and related classes
// Author: Vadim Zeitlin
// Modified by:
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "univscrthumb.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
@@
-29,9
+25,9
@@
#ifndef WX_PRECOMP
#include "wx/window.h"
#ifndef WX_PRECOMP
#include "wx/window.h"
- #include "wx/renderer.h"
#endif // WX_PRECOMP
#endif // WX_PRECOMP
+#include "wx/renderer.h"
#include "wx/univ/scrtimer.h"
#include "wx/univ/scrthumb.h"
#include "wx/univ/scrtimer.h"
#include "wx/univ/scrthumb.h"
@@
-63,7
+59,9
@@
struct WXDLLEXPORT wxScrollThumbCaptureData
m_window->ReleaseMouse();
}
m_window->ReleaseMouse();
}
+#if wxUSE_TIMER
delete m_timerScroll;
delete m_timerScroll;
+#endif // wxUSE_TIMER
}
// the thumb part being held pressed
}
// the thumb part being held pressed
@@
-87,6
+85,8
@@
struct WXDLLEXPORT wxScrollThumbCaptureData
// wxScrollTimer: the timer used when the arrow is kept pressed
// ----------------------------------------------------------------------------
// wxScrollTimer: the timer used when the arrow is kept pressed
// ----------------------------------------------------------------------------
+#if wxUSE_TIMER
+
class wxScrollThumbTimer : public wxScrollTimer
{
public:
class wxScrollThumbTimer : public wxScrollTimer
{
public:
@@
-124,6
+124,8
@@
protected:
int m_inc;
};
int m_inc;
};
+#endif // wxUSE_TIMER
+
// ============================================================================
// implementation
// ============================================================================
// ============================================================================
// implementation
// ============================================================================
@@
-196,6
+198,7
@@
bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const
// generate an additional event if we start dragging the thumb
m_control->OnThumbDragStart(GetThumbPos(event));
}
// generate an additional event if we start dragging the thumb
m_control->OnThumbDragStart(GetThumbPos(event));
}
+#if wxUSE_TIMER
else // not the thumb
{
// start timer for auto scrolling when the user presses the mouse
else // not the thumb
{
// start timer for auto scrolling when the user presses the mouse
@@
-203,6
+206,7
@@
bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const
m_captureData->m_timerScroll =
new wxScrollThumbTimer(m_control, shaftPart);
}
m_captureData->m_timerScroll =
new wxScrollThumbTimer(m_control, shaftPart);
}
+#endif // wxUSE_TIMER
}
// release mouse if the *same* button went up
else if ( HasCapture() && (btn == m_captureData->m_btnCapture) )
}
// release mouse if the *same* button went up
else if ( HasCapture() && (btn == m_captureData->m_btnCapture) )