diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 213f6b0b67..61eb07927b 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -109,13 +109,14 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, ); // Now create min static control - wxSprintf(wxBuffer, wxT("%d"), minValue); + wxString minLabel; + minLabel.Printf(wxT("%d"), minValue); wstyle = STATIC_FLAGS; if ( m_windowStyle & wxCLIP_SIBLINGS ) msStyle |= WS_CLIPSIBLINGS; m_staticMin = (WXHWND) CreateWindowEx ( - 0, wxT("STATIC"), wxBuffer, + 0, wxT("STATIC"), minLabel, wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL @@ -153,7 +154,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, HWND scroll_bar = CreateWindowEx ( - MakeExtendedStyle(m_windowStyle), TRACKBAR_CLASS, wxBuffer, + MakeExtendedStyle(m_windowStyle), TRACKBAR_CLASS, wxT(""), msStyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL @@ -179,7 +180,8 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, if ( m_windowStyle & wxSL_LABELS ) { // Finally, create max value static item - wxSprintf(wxBuffer, wxT("%d"), maxValue); + wxString maxLabel; + maxLabel.Printf(wxT("%d"), maxValue); wstyle = STATIC_FLAGS; if ( m_windowStyle & wxCLIP_SIBLINGS ) @@ -187,7 +189,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, m_staticMax = (WXHWND) CreateWindowEx ( - 0, wxT("STATIC"), wxBuffer, + 0, wxT("STATIC"), maxLabel, wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL @@ -319,8 +321,9 @@ void wxSlider95::SetValue(int value) if (m_staticValue) { - wxSprintf(wxBuffer, wxT("%d"), value); - ::SetWindowText((HWND) m_staticValue, wxBuffer); + wxString str; + str.Printf(wxT("%d"), value); + ::SetWindowText((HWND) m_staticValue, str); } } diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp index 9824dafd2a..af096e87f3 100644 --- a/src/msw/slidrmsw.cpp +++ b/src/msw/slidrmsw.cpp @@ -92,11 +92,12 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, wxGetInstance(), NULL); // Now create min static control - wxSprintf(wxBuffer, wxT("%d"), minValue); + 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"), wxBuffer, + m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf, wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL); @@ -107,7 +108,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, else msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; - HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("SCROLLBAR"), wxBuffer, + HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("SCROLLBAR"), wxT(""), msStyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); @@ -126,11 +127,11 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id, SubclassWin(GetHWND()); // Finally, create max value static item - wxSprintf(wxBuffer, wxT("%d"), maxValue); + buf.Printf(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"), buf, wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL); @@ -261,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); } }