X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..f20e3df6d3a2c69d2941dddd4e815d4ceea29abe:/src/motif/spinbutt.cpp?ds=sidebyside diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp index f01ea0a2a4..5276663d1e 100644 --- a/src/motif/spinbutt.cpp +++ b/src/motif/spinbutt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/motif/spinbutt.cpp // Purpose: wxSpinButton // Author: Julian Smart // Modified by: @@ -182,7 +182,8 @@ void wxArrowButton::StopTimerCallback( Widget w, XtPointer clientData, btn->m_timer = 0; } -bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id, +bool wxArrowButton::Create( wxSpinButton* parent, + wxWindowID WXUNUSED(id), ArrowDirection d, const wxPoint& pos, const wxSize& size ) { @@ -237,8 +238,8 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id, // wxSpinButton // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl); -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent); +IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) static void CalcSizes( const wxPoint& pt, const wxSize& sz, wxPoint& pt1, wxSize& sz1, @@ -309,19 +310,12 @@ void wxSpinButton::DoMoveWindow(int x, int y, int width, int height) m_down->SetSize( pt2.x, pt2.y, sz2.x, sz2.y ); } -void wxSpinButton::DoSetSize(int x, int y, int width, int height, - int sizeFlags) +void wxSpinButton::DoSetSize(int x, int y, int width, int height, int sizeFlags) { -#ifdef __VMS__ -#pragma message disable codcauunr -#endif - if( sizeFlags & wxSIZE_USE_EXISTING && width == -1 ) + if ( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) && width == -1 ) width = GetSize().x; - if( sizeFlags & wxSIZE_USE_EXISTING && height == -1 ) + if ( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) && height == -1 ) height = GetSize().y; -#ifdef __VMS__ -#pragma message enable codcauunr -#endif wxControl::DoSetSize(x, y, width, height, 0); }