fixing searchctrl on osx_cocoa, changing type for peer to wxSearchCtrl

[wxWidgets.git] / src / xrc / xh_scwin.cpp

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index e99190c020d6af382844e25fa9edf19ef842a483..78b70ce059f34c45250bbbc0bb4cb5e2416859b4 100644 (file)
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_scwin.cpp
+// Name:        src/xrc/xh_scwin.cpp

 // Purpose:     XRC resource for wxScrolledWindow
 // Author:      Vaclav Slavik
 // Created:     2002/10/18
 // Purpose:     XRC resource for wxScrolledWindow
 // Author:      Vaclav Slavik
 // Created:     2002/10/18


@@ -18,8 +18,11 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_scwin.h"
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_scwin.h"

-#include "wx/scrolwin.h"
-#include "wx/frame.h"  // to get wxNO_3D
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+    #include "wx/scrolwin.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 


@@ -30,7 +33,9 @@ wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler()
     XRC_ADD_STYLE(wxVSCROLL);
 
     // wxPanel styles
     XRC_ADD_STYLE(wxVSCROLL);
 
     // wxPanel styles

+#if WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxNO_3D);

+#endif // WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
 
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
 


@@ -50,6 +55,12 @@ wxObject *wxScrolledWindowXmlHandler::DoCreateResource()
     SetupWindow(control);
     CreateChildren(control);
 
     SetupWindow(control);
     CreateChildren(control);
 

+    if ( HasParam(wxT("scrollrate")) )
+    {
+        wxSize rate = GetSize(wxT("scrollrate"));
+        control->SetScrollRate(rate.x, rate.y);
+    }
+

     return control;
 }
 
     return control;
 }