cleaning up common OSX code

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 31c5aa60ec4ad4111ca0c76e45466646ee4c2fd0..e386099c3aa9e5354fd9cb4aa3d5085196563758 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -42,6 +42,7 @@
 #include "wx/module.h"
 #include "wx/private/stattext.h"
 #include "wx/bookctrl.h"
+#include "wx/scrolwin.h"
 
 #if wxUSE_DISPLAY
 #include "wx/display.h"
@@ -528,6 +529,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
 {
     if (dialog->GetSizer())
     {
+#if wxUSE_BOOKCTRL
         wxBookCtrlBase* bookContentWindow = wxDynamicCast(dialog->GetContentWindow(), wxBookCtrlBase);
 
         if (bookContentWindow)
@@ -563,6 +565,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
             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.
@@ -766,7 +769,7 @@ int wxStandardDialogLayoutAdapter::DoMustScroll(wxDialog* dialog, wxSize& window
 #if wxUSE_DISPLAY
     displaySize = wxDisplay(wxDisplay::GetFromWindow(dialog)).GetClientArea().GetSize();
 #else
-    displaySize = wxGetClientDisplayRect();
+    displaySize = wxGetClientDisplayRect().GetSize();
 #endif
 
     int flags = 0;