Updated font dialog constructors to use a reference to the font data

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index f614ea9647d9e2b8560534e9fb1c5d1729c95666..acf05c500b1178d52fecaeaa070eea4a52dfd3f3 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -13,7 +13,7 @@
 #define _WX_GENERIC_SCROLLWIN_H_
 
 #ifdef __GNUG__
-    #pragma interface "scrolwin.h"
+    #pragma interface "genscrolwin.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -66,8 +66,25 @@ public:
 
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
 
+        // lay out the window and its children
+    virtual bool Layout();
+
+    virtual void DoSetVirtualSize( int x, int y );
+
+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()
 };
 
 #ifdef __VISUALC__
@@ -76,3 +93,5 @@ private:
 
 #endif
     // _WX_GENERIC_SCROLLWIN_H_
+
+// vi:sts=4:sw=4:et