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

fix crashes in the calctl sample under OS/2 (patch 1495898)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-28 15:20:32 +00:00
parent 7a828c7ffb
commit 0bb4ad85f3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/calctrl.cpp
View File

@@ -788,7 +788,7 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
{ {
int yDiff; int yDiff;
if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ) if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth )
{ {
wxSize sizeCombo = m_comboMonth->GetSize(); wxSize sizeCombo = m_comboMonth->GetSize();
wxSize sizeStatic = m_staticMonth->GetSize(); wxSize sizeStatic = m_staticMonth->GetSize();
@@ -816,7 +816,7 @@ void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
{ {
wxControl::DoGetPosition(x, y); wxControl::DoGetPosition(x, y);
if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ) if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && GetMonthControl() )
{ {
// our real top corner is not in this position // our real top corner is not in this position
if ( y ) if ( y )