added convenient wxON_BLOCK_EXIT_SET() macro

[wxWidgets.git] / include / wx / scrolwin.h

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 001eb0bca8b6babfb2ddcb2eee54bb14060f2b1f..0215586e952b3bba7439ac74820fc6c2c5225ac9 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -48,7 +48,7 @@ class WXDLLIMPEXP_FWD_BASE wxTimer;
 //
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxScrollHelper
+class WXDLLIMPEXP_CORE wxScrollHelper
 {
 public:
     // ctor must be given the associated window
@@ -162,6 +162,7 @@ public:
 #if wxUSE_MOUSEWHEEL
     void HandleOnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL
+    void HandleOnChildFocus(wxChildFocusEvent& event);
 
     // FIXME: this is needed for now for wxPlot compilation, should be removed
     //        once it is fixed!
@@ -195,7 +196,6 @@ protected:
     bool ScrollLayout();
     void ScrollDoSetVirtualSize(int x, int y);
     wxSize ScrollGetBestVirtualSize() const;
-    wxSize ScrollGetWindowSizeForVirtualSize(const wxSize& size) const;
 
     // change just the target window (unlike SetWindow which changes m_win as
     // well)
@@ -245,10 +245,7 @@ public:                                                                       \
     virtual void DoSetVirtualSize(int x, int y)                               \
         { ScrollDoSetVirtualSize(x, y); }                                     \
     virtual wxSize GetBestVirtualSize() const                                 \
-        { return ScrollGetBestVirtualSize(); }                                \
-protected:                                                                    \
-    virtual wxSize GetWindowSizeForVirtualSize(const wxSize& size) const      \
-        { return ScrollGetWindowSizeForVirtualSize(size); }
+        { return ScrollGetBestVirtualSize(); }
 
 // include the declaration of wxScrollHelperNative if needed
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
@@ -263,7 +260,7 @@ protected:                                                                    \
 // wxScrolledWindow: a wxWindow which knows how to scroll
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxScrolledWindow : public wxPanel,
+class WXDLLIMPEXP_CORE wxScrolledWindow : public wxPanel,
                                      public wxScrollHelperNative
 {
 public:
@@ -297,6 +294,8 @@ public:
     WX_FORWARD_TO_SCROLL_HELPER()
 
 protected:
+    virtual wxSize DoGetBestSize() const;
+
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()
     void OnPaint(wxPaintEvent& event);