projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented Enable for wxMenuBar to avoid assert
[wxWidgets.git]
/
src
/
generic
/
scrlwing.cpp
diff --git
a/src/generic/scrlwing.cpp
b/src/generic/scrlwing.cpp
index 03165ffd11b2f1055bef7ec4edf99c872d44d07b..05e5a0c48c246675a7b7ed2d60746aab18452721 100644
(file)
--- a/
src/generic/scrlwing.cpp
+++ b/
src/generic/scrlwing.cpp
@@
-1243,10
+1243,8
@@
void wxGenericScrolledWindow::DoSetVirtualSize(int x, int y)
wxPanel::DoSetVirtualSize( x, y );
AdjustScrollbars();
wxPanel::DoSetVirtualSize( x, y );
AdjustScrollbars();
-#if wxUSE_CONSTRAINTS
if (GetAutoLayout())
Layout();
if (GetAutoLayout())
Layout();
-#endif
}
void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
}
void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
@@
-1259,12
+1257,12
@@
void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
}
#ifdef __WXMSW__
}
#ifdef __WXMSW__
-long
+WXLRESULT
wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam,
WXLPARAM lParam)
{
wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam,
WXLPARAM lParam)
{
-
long
rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam);
+
WXLRESULT
rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam);
#ifndef __WXWINCE__
// we need to process arrows ourselves for scrolling
#ifndef __WXWINCE__
// we need to process arrows ourselves for scrolling