X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9a4f62064559ddf7b88afb1bdcfbdf22893d9a5..2e9760c0ee8b20ea5c85e7cacd016e84957fcebe:/include/wx/gtk1/scrolwin.h

diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h
index 98fb2c2335..c9abfd3dce 100644
--- a/include/wx/gtk1/scrolwin.h
+++ b/include/wx/gtk1/scrolwin.h
@@ -37,18 +37,18 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 class WXDLLEXPORT wxScrolledWindow : public wxPanel
 {
 public:
-    wxScrolledWindow();
+    wxScrolledWindow()
+        { Init(); }
+        
     wxScrolledWindow(wxWindow *parent,
                      wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,
                      const wxString& name = wxPanelNameStr)
-    {
-        Create(parent, id, pos, size, style, name);
-    }
-
-    ~wxScrolledWindow();
+        { Create(parent, id, pos, size, style, name); }
+        
+    void Init();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -124,10 +124,17 @@ public:
     
     void GtkVScroll( float value );
     void GtkHScroll( float value );
+    void GtkVConnectEvent();
+    void GtkHConnectEvent();
+    void GtkVDisconnectEvent();
+    void GtkHDisconnectEvent();
 
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
     
+    // Overridden from wxWindows due callback being static
+    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
+    
 protected:
     wxWindow             *m_targetWindow;
     int                   m_xScrollPixelsPerLine;