projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added WXTRACE env. variable
[wxWidgets.git]
/
src
/
msw
/
slidrmsw.cpp
diff --git
a/src/msw/slidrmsw.cpp
b/src/msw/slidrmsw.cpp
index c6124f512cc8905b7d7c4cdb1b350b1454753b21..9824dafd2a4f473746692d5f45dd67322ae21055 100644
(file)
--- a/
src/msw/slidrmsw.cpp
+++ b/
src/msw/slidrmsw.cpp
@@
-29,9
+29,7
@@
#include "wx/msw/slidrmsw.h"
#include "wx/msw/private.h"
#include "wx/msw/slidrmsw.h"
#include "wx/msw/private.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
-#endif
// Slider
wxSliderMSW::wxSliderMSW()
// Slider
wxSliderMSW::wxSliderMSW()
@@
-43,7
+41,6
@@
wxSliderMSW::wxSliderMSW()
m_lineSize = 1;
m_rangeMax = 0;
m_rangeMin = 0;
m_lineSize = 1;
m_rangeMax = 0;
m_rangeMin = 0;
- m_tickFreq = 0;
}
bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
}
bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
@@
-54,7
+51,9
@@
bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
SetName(name);
const wxString& name)
{
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
SetValidator(validator);
+#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
@@
-66,7
+65,6
@@
bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
m_pageSize = 1;
m_lineSize = 1;
m_windowStyle = style;
m_pageSize = 1;
m_lineSize = 1;
m_windowStyle = style;
- m_tickFreq = 0;
if ( id == -1 )
m_windowId = (int)NewControlId();
if ( id == -1 )
m_windowId = (int)NewControlId();
@@
-82,6
+80,9
@@
bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
+
bool want3D;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
bool want3D;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
@@
-92,14
+93,14
@@
bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
// Now create min static control
wxSprintf(wxBuffer, wxT("%d"), minValue);
// Now create min static control
wxSprintf(wxBuffer, wxT("%d"), minValue);
+ DWORD wstyle = STATIC_FLAGS;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ wstyle |= WS_CLIPSIBLINGS;
m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
-
STATIC_FLAGS
,
+
wstyle
,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
- // Now create slider
- m_windowId = (int)NewControlId();
-
msStyle = 0;
if (m_windowStyle & wxSL_VERTICAL)
msStyle = SBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
msStyle = 0;
if (m_windowStyle & wxSL_VERTICAL)
msStyle = SBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
@@
-126,8
+127,11
@@
bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
// Finally, create max value static item
wxSprintf(wxBuffer, wxT("%d"), maxValue);
// Finally, create max value static item
wxSprintf(wxBuffer, wxT("%d"), maxValue);
+ wstyle = STATIC_FLAGS;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ wstyle |= WS_CLIPSIBLINGS;
m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
-
STATIC_FLAGS
,
+
wstyle
,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
@@
-231,6
+235,7
@@
bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
GetEventHandler()->ProcessEvent(event);
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
GetEventHandler()->ProcessEvent(event);
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+ cevent.SetInt( newPos );
cevent.SetEventObject( this );
return GetEventHandler()->ProcessEvent( cevent );
cevent.SetEventObject( this );
return GetEventHandler()->ProcessEvent( cevent );
@@
-326,9
+331,9
@@
void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int currentX, currentY;
GetPosition(¤tX, ¤tY);
int currentX, currentY;
GetPosition(¤tX, ¤tY);
- if (x == -1
||
(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (x == -1
&& !
(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
x1 = currentX;
x1 = currentX;
- if (y == -1
||
(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (y == -1
&& !
(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY;
AdjustForParentClientOrigin(x1, y1, sizeFlags);
y1 = currentY;
AdjustForParentClientOrigin(x1, y1, sizeFlags);
@@
-484,11
+489,6
@@
WXHBRUSH wxSliderMSW::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
}
return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
}
-// For trackbars only
-void wxSliderMSW::SetTickFreq(int n, int pos)
-{
-}
-
void wxSliderMSW::SetPageSize(int pageSize)
{
m_pageSize = pageSize;
void wxSliderMSW::SetPageSize(int pageSize)
{
m_pageSize = pageSize;
@@
-499,14
+499,6
@@
int wxSliderMSW::GetPageSize() const
return m_pageSize;
}
return m_pageSize;
}
-void wxSliderMSW::ClearSel()
-{
-}
-
-void wxSliderMSW::ClearTicks()
-{
-}
-
void wxSliderMSW::SetLineSize(int lineSize)
{
m_lineSize = lineSize;
void wxSliderMSW::SetLineSize(int lineSize)
{
m_lineSize = lineSize;
@@
-517,31
+509,15
@@
int wxSliderMSW::GetLineSize() const
return m_lineSize;
}
return m_lineSize;
}
-int wxSliderMSW::GetSelEnd() const
-{
- return 0;
-}
-
-int wxSliderMSW::GetSelStart() const
-{
- return 0;
-}
-
-void wxSliderMSW::SetSelection(int minPos, int maxPos)
-{
-}
-
-void wxSliderMSW::SetThumbLength(int len)
+// Not yet implemented
+void wxSliderMSW::SetThumbLength(int WXUNUSED(lenPixels))
{
}
{
}
+// Not yet implemented
int wxSliderMSW::GetThumbLength() const
{
int wxSliderMSW::GetThumbLength() const
{
- return 0;
-}
-
-void wxSliderMSW::SetTick(int tickPos)
-{
+ return 0;
}
bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const
}
bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const