Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed logic bug in DoSetSize() (disabling a warning is good, fixing it is even better...)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-10-08 16:58:25 +00:00
parent 68aef3dc22
commit 541c319a2d
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/motif/spinbutt.cpp
View File

@@ -238,8 +238,8 @@ bool wxArrowButton::Create( wxSpinButton* parent,
// wxSpinButton // wxSpinButton
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl); IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent); IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
static void CalcSizes( const wxPoint& pt, const wxSize& sz, static void CalcSizes( const wxPoint& pt, const wxSize& sz,
wxPoint& pt1, wxSize& sz1, wxPoint& pt1, wxSize& sz1,
@@ -310,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 ); m_down->SetSize( pt2.x, pt2.y, sz2.x, sz2.y );
} }
void wxSpinButton::DoSetSize(int x, int y, int width, int height, void wxSpinButton::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int sizeFlags)
{ {
#ifdef __VMS__ if ( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) && width == -1 )
#pragma message disable codcauunr
#endif
if( sizeFlags & wxSIZE_USE_EXISTING && width == -1 )
width = GetSize().x; width = GetSize().x;
if( sizeFlags & wxSIZE_USE_EXISTING && height == -1 ) if ( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) && height == -1 )
height = GetSize().y; height = GetSize().y;
#ifdef __VMS__
#pragma message enable codcauunr
#endif
wxControl::DoSetSize(x, y, width, height, 0); wxControl::DoSetSize(x, y, width, height, 0);
} }