made wxLog::Set/GetVerbose() static back again

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

diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h
index f28f92c8d3d4693f269eea8f99db3f3f50d37b5b..e92401642043e195fd1eb0ed794cdd5d468c3585 100644 (file)
--- a/include/wx/gtk1/scrolwin.h
+++ b/include/wx/gtk1/scrolwin.h
@@ -26,7 +26,9 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style

+#ifndef wxScrolledWindowStyle

 #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
 #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)

+#endif

 
 // ----------------------------------------------------------------------------
 // wxScrolledWindow
 
 // ----------------------------------------------------------------------------
 // wxScrolledWindow


@@ -35,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,


@@ -108,14 +110,30 @@ 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; }
+    double GetScaleY() const { return m_scaleY; }
+

     // implementation from now on
     // implementation from now on

+    void OnScroll(wxScrollWinEvent& event);

     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);
+
+    // Overridden from wxWindows due callback being static
+    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );

 
 protected:
     wxWindow             *m_targetWindow;
 
 protected:
     wxWindow             *m_targetWindow;


@@ -130,6 +148,8 @@ protected:
     int                   m_xScrollLinesPerPage;
     int                   m_yScrollLinesPerPage;
 
     int                   m_xScrollLinesPerPage;
     int                   m_yScrollLinesPerPage;
 

+    double                m_scaleY,m_scaleX;
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_ABSTRACT_CLASS(wxScrolledWindow)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_ABSTRACT_CLASS(wxScrolledWindow)