Some OS/2 updates

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index f614ea9647d9e2b8560534e9fb1c5d1729c95666..ecf2c8fa2691f08648d14be76fa14b88ccf11b3a 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -13,7 +13,7 @@
 #define _WX_GENERIC_SCROLLWIN_H_
 
 #ifdef __GNUG__
 #define _WX_GENERIC_SCROLLWIN_H_
 
 #ifdef __GNUG__

-    #pragma interface "scrolwin.h"
+    #pragma interface "genscrolwin.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -42,7 +42,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
                                             public wxScrollHelper
 {
 class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
                                             public wxScrollHelper
 {

-public:
+ public:

     wxGenericScrolledWindow() : wxScrollHelper(this) { }
     wxGenericScrolledWindow(wxWindow *parent,
                      wxWindowID id = -1,
     wxGenericScrolledWindow() : wxScrollHelper(this) { }
     wxGenericScrolledWindow(wxWindow *parent,
                      wxWindowID id = -1,


@@ -66,8 +66,14 @@ public:
 
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
 
 
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
 

+protected:
+    // this is needed for wxEVT_PAINT processing hack described in
+    // wxScrollHelperEvtHandler::ProcessEvent()
+    void OnPaint(wxPaintEvent& event);
+

 private:
     DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)
 private:
     DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)

+    DECLARE_EVENT_TABLE()

 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__