projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxDFB: implemented Raise() and Lower() for TLWs
[wxWidgets.git]
/
src
/
common
/
dlgcmn.cpp
diff --git
a/src/common/dlgcmn.cpp
b/src/common/dlgcmn.cpp
index 973919ce4e6dc172680018e753295649a7252e4c..e386099c3aa9e5354fd9cb4aa3d5085196563758 100644
(file)
--- a/
src/common/dlgcmn.cpp
+++ b/
src/common/dlgcmn.cpp
@@
-529,6
+529,7
@@
bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
{
if (dialog->GetSizer())
{
{
if (dialog->GetSizer())
{
+#if wxUSE_BOOKCTRL
wxBookCtrlBase* bookContentWindow = wxDynamicCast(dialog->GetContentWindow(), wxBookCtrlBase);
if (bookContentWindow)
wxBookCtrlBase* bookContentWindow = wxDynamicCast(dialog->GetContentWindow(), wxBookCtrlBase);
if (bookContentWindow)
@@
-564,6
+565,7
@@
bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
FitWithScrolling(dialog, windows);
}
else
FitWithScrolling(dialog, windows);
}
else
+#endif // wxUSE_BOOKCTRL
{
// If we have an arbitrary dialog, create a scrolling area for the main content, and a button sizer
// for the main buttons.
{
// If we have an arbitrary dialog, create a scrolling area for the main content, and a button sizer
// for the main buttons.
@@
-767,7
+769,7
@@
int wxStandardDialogLayoutAdapter::DoMustScroll(wxDialog* dialog, wxSize& window
#if wxUSE_DISPLAY
displaySize = wxDisplay(wxDisplay::GetFromWindow(dialog)).GetClientArea().GetSize();
#else
#if wxUSE_DISPLAY
displaySize = wxDisplay(wxDisplay::GetFromWindow(dialog)).GetClientArea().GetSize();
#else
- displaySize = wxGetClientDisplayRect();
+ displaySize = wxGetClientDisplayRect()
.GetSize()
;
#endif
int flags = 0;
#endif
int flags = 0;