added wxHtmlWindow::LoadFile

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index ecf2c8fa2691f08648d14be76fa14b88ccf11b3a..64737702c677b3dffe5c9d8af8ab29cd9347b30d 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "genscrolwin.h"
 #endif
 
@@ -27,7 +27,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
 #ifndef wxScrolledWindowStyle
-#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
+    #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
 #endif
 
 // avoid triggering this stupid VC++ warning
@@ -42,7 +42,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
                                             public wxScrollHelper
 {
- public:
+public:
     wxGenericScrolledWindow() : wxScrollHelper(this) { }
     wxGenericScrolledWindow(wxWindow *parent,
                      wxWindowID id = -1,
@@ -66,11 +66,33 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
 
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
 
+    // lay out the window and its children
+    virtual bool Layout();
+
+    virtual void DoSetVirtualSize(int x, int y);
+
+#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;
+     // Need to do this otherwise the compiler gets confuced 
+     // between float and int calls to this function.
+     void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+        { wxScrollHelper::CalcScrolledPosition(x, y, xx, yy); }
+     wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
+        { return wxScrollHelper::CalcScrolledPosition(pt); }
+#endif // WXWIN_COMPATIBILITY
+
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()
     void OnPaint(wxPaintEvent& event);
 
+    // we need to return a special WM_GETDLGCODE value to process just the
+    // arrows but let the other navigation characters through
+#ifdef __WXMSW__
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif // __WXMSW__
+
 private:
     DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)
     DECLARE_EVENT_TABLE()
@@ -82,3 +104,4 @@ private:
 
 #endif
     // _WX_GENERIC_SCROLLWIN_H_
+