Implemented wxGetClientDisplayRect which returns the dimensions of the

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 7a6302a8bf2aedd68778ae71568ba4a0dad30d39..1c9d92168ba88aee88fa1955ed4c6d1f3deabbfb 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -26,17 +26,19 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style

-#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL | wxTAB_TRAVERSAL)
+#ifndef wxScrolledWindowStyle
+#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
+#endif

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxScrolledWindow
+// wxGenericScrolledWindow

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxScrolledWindow : public wxPanel
+class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel

 {
 public:
 {
 public:

-    wxScrolledWindow();
-    wxScrolledWindow(wxWindow *parent,
+    wxGenericScrolledWindow();
+    wxGenericScrolledWindow(wxWindow *parent,

                      wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,


@@ -46,7 +48,7 @@ public:
         Create(parent, id, pos, size, style, name);
     }
 
         Create(parent, id, pos, size, style, name);
     }
 

-    ~wxScrolledWindow();
+    ~wxGenericScrolledWindow();

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


@@ -55,7 +57,7 @@ public:
                 long style = wxScrolledWindowStyle,
                 const wxString& name = wxPanelNameStr);
 
                 long style = wxScrolledWindowStyle,
                 const wxString& name = wxPanelNameStr);
 

-    // Normally the wxScrolledWindow will scroll itself, but in
+    // 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
     // 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


@@ -115,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 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);
 
     // automatically change the origin according to the scroll position.
     virtual void PrepareDC(wxDC& dc);
 


@@ -123,6 +125,7 @@ public:
     void OnScroll(wxScrollWinEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnPaint(wxPaintEvent& event);
     void OnScroll(wxScrollWinEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnPaint(wxPaintEvent& event);

+    void OnChar(wxKeyEvent& event);

 
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
 
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);


@@ -144,7 +147,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_ABSTRACT_CLASS(wxScrolledWindow)
+    DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)

 };
 
 #endif
 };
 
 #endif