Disable CallAfter() for MSVC 7 too, it can't compile this code.

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index f1ca429ffffbd89dbf061859fab9bfb61377c5f7..c4bd4dfa933be325826fe097e8ba942346cac879 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/scrolwin.h
+// Name:        wx/scrolwin.h

 // Purpose:     wxScrolledWindow, wxScrolledControl and wxScrollHelper
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxScrolledWindow, wxScrolledControl and wxScrollHelper
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -252,10 +252,6 @@ protected:
     // delete the event handler we installed
     void DeleteEvtHandler();
 
     // delete the event handler we installed
     void DeleteEvtHandler();
 

-    // calls wxScrollHelperEvtHandler::ResetDrawnFlag(), see explanation
-    // in wxScrollHelperEvtHandler::ProcessEvent()
-    void ResetDrawnFlag();
-

     // this function should be overridden to return the size available for
     // m_targetWindow inside m_win of the given size
     //
     // this function should be overridden to return the size available for
     // m_targetWindow inside m_win of the given size
     //


@@ -376,14 +372,15 @@ public:
         this->MacSetClipChildren(true);
 #endif
 
         this->MacSetClipChildren(true);
 #endif
 

-        this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxScrolled::OnPaint));
-

         // by default, we're scrollable in both directions (but if one of the
         // styles is specified explicitly, we shouldn't add the other one
         // automatically)
         if ( !(style & (wxHSCROLL | wxVSCROLL)) )
             style |= wxHSCROLL | wxVSCROLL;
 
         // by default, we're scrollable in both directions (but if one of the
         // styles is specified explicitly, we shouldn't add the other one
         // automatically)
         if ( !(style & (wxHSCROLL | wxVSCROLL)) )
             style |= wxHSCROLL | wxVSCROLL;
 

+        if ( style & wxALWAYS_SHOW_SB )
+            ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS);
+

         return T::Create(parent, winid, pos, size, style, name);
     }
 
         return T::Create(parent, winid, pos, size, style, name);
     }
 


@@ -405,16 +402,6 @@ protected:
     }
 
 private:
     }
 
 private:

-    // this is needed for wxEVT_PAINT processing hack described in
-    // wxScrollHelperEvtHandler::ProcessEvent()
-    void OnPaint(wxPaintEvent& event)
-    {
-        // the user code didn't really draw the window if we got here, so set
-        // this flag to try to call OnDraw() later
-        ResetDrawnFlag();
-        event.Skip();
-    }
-

     // VC++ 6 gives warning for the declaration of template member function
     // without definition
 #ifndef __VISUALC6__
     // VC++ 6 gives warning for the declaration of template member function
     // without definition
 #ifndef __VISUALC6__