Added symptomatic fix to wrong height in wxStaticText.

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index 98fb2c2335c68a570dfcb8832a28bf6ebb09f59a..e92401642043e195fd1eb0ed794cdd5d468c3585 100644 (file)
--- 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:
 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);
-    }
+        { Create(parent, id, pos, size, style, name); }

 
 

-    ~wxScrolledWindow();
+    void Init();

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -110,7 +110,7 @@ public:
 
     // Adjust the scrollbars
     virtual void AdjustScrollbars();
 
     // 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; }
     // 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,13 +121,20 @@ public:
     void OnSize(wxSizeEvent& event);
     void OnPaint(wxPaintEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnPaint(wxPaintEvent& event);
     void OnChar(wxKeyEvent& event);

-    
+

     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);

-    
+
+    // Overridden from wxWindows due callback being static
+    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
+

 protected:
     wxWindow             *m_targetWindow;
     int                   m_xScrollPixelsPerLine;
 protected:
     wxWindow             *m_targetWindow;
     int                   m_xScrollPixelsPerLine;


@@ -140,7 +147,7 @@ protected:
     int                   m_yScrollLines;
     int                   m_xScrollLinesPerPage;
     int                   m_yScrollLinesPerPage;
     int                   m_yScrollLines;
     int                   m_xScrollLinesPerPage;
     int                   m_yScrollLinesPerPage;

-    
+

     double                m_scaleY,m_scaleX;
 
 private:
     double                m_scaleY,m_scaleX;
 
 private: