added and documented wxApp::OnExceptionInMainLoop()

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 8e12c38018ddc90c2e85fa6a0235da328d904163..9ebdc14f1bb658b991cf9c91e9909a8b7adc349a 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -84,7 +84,7 @@ public:
         DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
         return p2;
     }
         DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
         return p2;
     }

-    
+

     virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
     virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
 
     virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
     virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
 


@@ -139,9 +139,14 @@ public:
     //        once it is fixed!
     void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
 
     //        once it is fixed!
     void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
 

+#if WXWIN_COMPATIBILITY_2_2
+    // Compatibility only, don't use
+    void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
+#endif // WXWIN_COMPATIBILITY_2_2
+

 protected:
     // get pointer to our scroll rect if we use it or NULL
 protected:
     // get pointer to our scroll rect if we use it or NULL

-    const wxRect *GetRect() const
+    const wxRect *GetScrollRect() const

     {
         return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL;
     }
     {
         return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL;
     }


@@ -196,6 +201,8 @@ protected:
 #endif // wxUSE_MOUSEWHEEL
 
     wxScrollHelperEvtHandler *m_handler;
 #endif // wxUSE_MOUSEWHEEL
 
     wxScrollHelperEvtHandler *m_handler;

+
+    DECLARE_NO_COPY_CLASS(wxScrollHelper)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -212,17 +219,17 @@ protected:
     public:
         wxScrolledWindow() { }
         wxScrolledWindow(wxWindow *parent,
     public:
         wxScrolledWindow() { }
         wxScrolledWindow(wxWindow *parent,

-                         wxWindowID id = -1,
+                         wxWindowID winid = -1,

                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxScrolledWindowStyle,
                          const wxString& name = wxPanelNameStr)
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxScrolledWindowStyle,
                          const wxString& name = wxPanelNameStr)

-            : wxGenericScrolledWindow(parent, id, pos, size, style, name)
+            : wxGenericScrolledWindow(parent, winid, pos, size, style, name)

         {
         }
 
     private:
         {
         }
 
     private:

-        DECLARE_CLASS(wxScrolledWindow)
+        DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)

     };
 
     #define wxSCROLLED_WINDOW_IS_GENERIC 1
     };
 
     #define wxSCROLLED_WINDOW_IS_GENERIC 1


@@ -231,4 +238,3 @@ protected:
 #endif
     // _WX_SCROLWIN_H_BASE_
 
 #endif
     // _WX_SCROLWIN_H_BASE_
 

-// vi:sts=4:sw=4:et