X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf5b09998e7d4606387975a56b6a954a98fd7b7..58071ea0089e929db5899d27072b10d79ed57f10:/include/wx/generic/scrolwin.h?ds=sidebyside

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 5e092a91a9..1d3a4d3404 100644
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "genscrolwin.h"
 #endif
 
@@ -27,7 +27,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
 #ifndef wxScrolledWindowStyle
-#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
+    #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
 #endif
 
 // avoid triggering this stupid VC++ warning
@@ -66,6 +66,9 @@ public:
 
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
 
+    // lay out the window and its children
+    virtual bool Layout();
+
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()
@@ -88,3 +91,4 @@ private:
 
 #endif
     // _WX_GENERIC_SCROLLWIN_H_
+