X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f048e32fcd5260f33fbebdafbe1a0deeda175419..276c8cfb5326cd365f48a51972f43ff355a2707d:/src/msw/slidrmsw.cpp?ds=sidebyside diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp index c6124f512c..09e384bc7a 100644 --- a/src/msw/slidrmsw.cpp +++ b/src/msw/slidrmsw.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "slidrmsw.h" #endif @@ -29,9 +29,7 @@ #include "wx/msw/slidrmsw.h" #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl) -#endif // Slider wxSliderMSW::wxSliderMSW() @@ -43,7 +41,6 @@ wxSliderMSW::wxSliderMSW() m_lineSize = 1; m_rangeMax = 0; m_rangeMin = 0; - m_tickFreq = 0; } bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, @@ -53,8 +50,13 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { + if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT ) + style |= wxBORDER_NONE; + SetName(name); +#if wxUSE_VALIDATORS SetValidator(validator); +#endif // wxUSE_VALIDATORS if (parent) parent->AddChild(this); SetBackgroundColour(parent->GetBackgroundColour()) ; @@ -66,9 +68,8 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, m_pageSize = 1; m_lineSize = 1; m_windowStyle = style; - m_tickFreq = 0; - if ( id == -1 ) + if ( id == wxID_ANY ) m_windowId = (int)NewControlId(); else m_windowId = id; @@ -79,11 +80,11 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, int height = size.y; // non-Win95 implementation - - long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER; - bool want3D; - WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; + long msStyle = SS_CENTER; + + WXDWORD exStyle = 0; + msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ; m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL, msStyle, @@ -91,22 +92,23 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, wxGetInstance(), NULL); // Now create min static control - wxSprintf(wxBuffer, wxT("%d"), minValue); - m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer, - STATIC_FLAGS, + wxString buf; + buf.Printf(wxT("%d"), minValue); + DWORD wstyle = STATIC_FLAGS; + if ( m_windowStyle & wxCLIP_SIBLINGS ) + wstyle |= WS_CLIPSIBLINGS; + m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf, + wstyle, 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 ; else msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; - HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("SCROLLBAR"), wxBuffer, + HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxEmptyString, msStyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); @@ -125,9 +127,12 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, SubclassWin(GetHWND()); // Finally, create max value static item - wxSprintf(wxBuffer, wxT("%d"), maxValue); - m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer, - STATIC_FLAGS, + buf.Printf(wxT("%d"), maxValue); + wstyle = STATIC_FLAGS; + if ( m_windowStyle & wxCLIP_SIBLINGS ) + wstyle |= WS_CLIPSIBLINGS; + m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf, + wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL); @@ -153,7 +158,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, SetSize(x, y, width, height); SetValue(value); - return TRUE; + return true; } bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, @@ -212,7 +217,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, if (nScrollInc == 0) { // no event... - return FALSE; + return false; } int newPos = position + nScrollInc; @@ -220,7 +225,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, if ( (newPos < GetMin()) || (newPos > GetMax()) ) { // out of range - but we did process it - return TRUE; + return true; } SetValue(newPos); @@ -231,6 +236,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, GetEventHandler()->ProcessEvent(event); wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() ); + cevent.SetInt( newPos ); cevent.SetEventObject( this ); return GetEventHandler()->ProcessEvent( cevent ); @@ -256,8 +262,9 @@ void wxSliderMSW::SetValue(int value) ::SetScrollPos(GetHwnd(), SB_CTL, value, TRUE); if (m_staticValue) { - wxSprintf(wxBuffer, wxT("%d"), value); - SetWindowText((HWND) m_staticValue, wxBuffer); + wxString buf; + buf.Printf(wxT("%d"), value); + SetWindowText((HWND) m_staticValue, buf); } } @@ -326,9 +333,9 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) int currentX, currentY; GetPosition(¤tX, ¤tY); - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) x1 = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) y1 = currentY; AdjustForParentClientOrigin(x1, y1, sizeFlags); @@ -342,7 +349,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) int cy; int cyf; - wxGetCharSize(GetHWND(), &cx, &cy,& this->GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont()); if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL) { @@ -366,11 +373,11 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) // a lot of space before the first character new_width += 3*cx; #endif - MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE); + ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE); x_offset += new_width + cx; } - MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE); + ::MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE); x_offset += (int)(min_len + cx); int slider_length = (int)(w1 - x_offset - max_len - cx); @@ -381,10 +388,10 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) if (slider_length < 100) slider_length = 100; - MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE); + ::MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE); x_offset += slider_length + cx; - MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE); + ::MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE); } else { @@ -393,7 +400,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) w1 = 200; if ( h1 < 0 ) h1 = 20; - MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE); + ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE); } } else @@ -421,11 +428,11 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) ... and replace with following line: */ new_width += cx; - MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE); + ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE); y_offset += valueHeight; } - MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE); + ::MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE); y_offset += cy; int slider_length = (int)(h1 - y_offset - cy - cy); @@ -437,10 +444,10 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) if (slider_length < 100) slider_length = 100; - MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE); + ::MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE); y_offset += slider_length; - MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE); + ::MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE); } else { @@ -449,7 +456,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) w1 = 20; if ( h1 < 0 ) h1 = 200; - MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE); + ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE); } } } @@ -484,11 +491,6 @@ WXHBRUSH wxSliderMSW::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, 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; @@ -499,14 +501,6 @@ int wxSliderMSW::GetPageSize() const return m_pageSize; } -void wxSliderMSW::ClearSel() -{ -} - -void wxSliderMSW::ClearTicks() -{ -} - void wxSliderMSW::SetLineSize(int lineSize) { m_lineSize = lineSize; @@ -517,31 +511,15 @@ int wxSliderMSW::GetLineSize() const 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 { - return 0; -} - -void wxSliderMSW::SetTick(int tickPos) -{ + return 0; } bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const @@ -571,7 +549,7 @@ bool wxSliderMSW::Show(bool show) ShowWindow((HWND) m_staticMin, (BOOL)cshow); if(m_staticMax) ShowWindow((HWND) m_staticMax, (BOOL)cshow); - return TRUE; + return true; }