X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bc0cd5d8119c86b28760d1b18f6a08b98145979..1348e1a5d9c2872a0c29a9cd3d1a4a35c998eeae:/include/wx/gtk/scrolwin.h?ds=inline diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index 2133e8f4cc..e924016420 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/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); - } + { Create(parent, id, pos, size, style, name); } - ~wxScrolledWindow(); + void Init(); bool Create(wxWindow *parent, wxWindowID id, @@ -110,7 +110,7 @@ public: // Adjust the scrollbars virtual void AdjustScrollbars(); - + // Set the scale factor, used in PrepareDC void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; } double GetScaleX() const { return m_scaleX; } @@ -121,16 +121,20 @@ public: void OnSize(wxSizeEvent& event); void OnPaint(wxPaintEvent& event); void OnChar(wxKeyEvent& event); - + 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; @@ -143,7 +147,7 @@ protected: int m_yScrollLines; int m_xScrollLinesPerPage; int m_yScrollLinesPerPage; - + double m_scaleY,m_scaleX; private: