X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf3da716f65a419cddc25bdb70ccd7cbe4a3afa7..bfb9ee966d5d1f29e49f38e340812ade4b3cc956:/include/wx/generic/scrolwin.h

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index ce7a477fec..1c9d92168b 100644
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -1,52 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        scrolwin.h
+// Name:        wx/generic/scrolwin.h
 // Purpose:     wxScrolledWindow class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SCROLWINH_G__
-#define __SCROLWINH_G__
+#ifndef _WX_GENERIC_SCROLLWIN_H_
+#define _WX_GENERIC_SCROLLWIN_H_
 
 #ifdef __GNUG__
-#pragma interface "scrolwin.h"
+    #pragma interface "scrolwin.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// headers and constants
+// ----------------------------------------------------------------------------
+
 #include "wx/window.h"
 #include "wx/panel.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
-class WXDLLEXPORT wxScrolledWindow : public wxPanel
+// default scrolled window style
+#ifndef wxScrolledWindowStyle
+#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
+#endif
+
+// ----------------------------------------------------------------------------
+// wxGenericScrolledWindow
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel
 {
 public:
-    wxScrolledWindow();
-    inline wxScrolledWindow(wxWindow *parent, wxWindowID id = -1,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxHSCROLL|wxVSCROLL,
-           const wxString& name = wxPanelNameStr)
+    wxGenericScrolledWindow();
+    wxGenericScrolledWindow(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();
+    ~wxGenericScrolledWindow();
 
-    bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxHSCROLL|wxVSCROLL,
-           const wxString& name = wxPanelNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxScrolledWindowStyle,
+                const wxString& name = wxPanelNameStr);
 
-    // Normally the wxScrolledWindow will scroll itself, but in 
-    // some rare occasions you might want it to scroll another 
-    // window (e.g. a child of it in order to scroll only a portion 
+    // Normally the wxGenericScrolledWindow will scroll itself, but in
+    // some rare occasions you might want it to scroll another
+    // window (e.g. a child of it in order to scroll only a portion
     // the area between the scrollbars (spreadsheet: only cell area
-    // will move). 
+    // will move).
     virtual void SetTargetWindow( wxWindow *target );
     virtual wxWindow *GetTargetWindow();
 
@@ -56,21 +71,21 @@ public:
     virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                              int noUnitsX, int noUnitsY,
                              int xPos = 0, int yPos = 0,
-			     bool noRefresh = FALSE );
+                             bool noRefresh = FALSE );
 
     // Physically scroll the window
     virtual void Scroll(int x_pos, int y_pos);
 
 #if WXWIN_COMPATIBILITY
     virtual void GetScrollUnitsPerPage(int *x_page, int *y_page) const;
-    virtual void CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const ;
+    virtual void CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const;
 #endif
 
-    int GetScrollPageSize(int orient) const ;
+    int GetScrollPageSize(int orient) const;
     void SetScrollPageSize(int orient, int pageSize);
 
     virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
-    
+
     // Enable/disable Windows scrolling in either direction.
     // If TRUE, wxWindows scrolls the canvas and only a bit of
     // the canvas is invalidated; no Clear() is necessary.
@@ -93,8 +108,8 @@ public:
     double GetScaleX() const { return m_scaleX; }
     double GetScaleY() const { return m_scaleY; }
 
-    virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const ;
-    virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const ;
+    virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
+    virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
 
     // Adjust the scrollbars
     virtual void AdjustScrollbars(void);
@@ -102,7 +117,7 @@ public:
     // Override this function to draw the graphic (or just process EVT_PAINT)
     virtual void OnDraw(wxDC& WXUNUSED(dc)) {};
 
-    // Override this function if you don't want to have wxScrolledWindow
+    // Override this function if you don't want to have wxGenericScrolledWindow
     // automatically change the origin according to the scroll position.
     virtual void PrepareDC(wxDC& dc);
 
@@ -110,6 +125,7 @@ public:
     void OnScroll(wxScrollWinEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnPaint(wxPaintEvent& event);
+    void OnChar(wxKeyEvent& event);
 
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
@@ -131,8 +147,8 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_ABSTRACT_CLASS(wxScrolledWindow)
+    DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)
 };
 
 #endif
-    // __SCROLWINH_G__
+    // _WX_GENERIC_SCROLLWIN_H_