removed wxUSE_XPM_IN_MSW from setup0.h

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

diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h
index 2133e8f4cc81570b936b1402efd52fc0561ecb17..c9abfd3dced193016b8a1001e2b6114cc73379f8 100644 (file)
--- 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:
 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)
     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,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -124,6 +124,10 @@ public:
     
     void GtkVScroll( float value );
     void GtkHScroll( float value );
     
     void GtkVScroll( float value );
     void GtkHScroll( float value );

+    void GtkVConnectEvent();
+    void GtkHConnectEvent();
+    void GtkVDisconnectEvent();
+    void GtkHDisconnectEvent();

 
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
 
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);