X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/generic/scrolwin.h?ds=sidebyside diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index 32c5c4e294..de52bde70e 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -6,16 +6,12 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GENERIC_SCROLLWIN_H_ #define _WX_GENERIC_SCROLLWIN_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "genscrolwin.h" -#endif - // ---------------------------------------------------------------------------- // headers and constants // ---------------------------------------------------------------------------- @@ -23,74 +19,9 @@ #include "wx/window.h" #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; - -// default scrolled window style -#ifndef wxScrolledWindowStyle - #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL) -#endif - -// avoid triggering this stupid VC++ warning -#ifdef __VISUALC__ - #pragma warning(disable:4355) // 'this' used in base member initializer list -#endif - // ---------------------------------------------------------------------------- // wxGenericScrolledWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel, - public wxScrollHelper -{ -public: - wxGenericScrolledWindow() : wxScrollHelper(this) { } - wxGenericScrolledWindow(wxWindow *parent, - wxWindowID winid = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr) - : wxScrollHelper(this) - { - Create(parent, winid, pos, size, style, name); - } - - virtual ~wxGenericScrolledWindow(); - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr); - - 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 WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif // __WXMSW__ - -private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericScrolledWindow) - DECLARE_EVENT_TABLE() -}; - -#ifdef __VISUALC__ - #pragma warning(default:4355) -#endif - -#endif - // _WX_GENERIC_SCROLLWIN_H_ +#endif // _WX_GENERIC_SCROLLWIN_H_