sockets work with wxDFB now

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 5e092a91a9318f9ec9994911d103eacc018cff87..de52bde70ea3e310698e81e20a8fffaf3ac0432b 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 

-#ifdef __GNUG__
-    #pragma interface "genscrolwin.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers and constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers and constants
 // ----------------------------------------------------------------------------


@@ -23,68 +19,9 @@
 #include "wx/window.h"
 #include "wx/panel.h"
 
 #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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxGenericScrolledWindow
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
-                                            public wxScrollHelper
-{
-public:
-    wxGenericScrolledWindow() : wxScrollHelper(this) { }
-    wxGenericScrolledWindow(wxWindow *parent,
-                     wxWindowID id = -1,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxScrolledWindowStyle,
-                     const wxString& name = wxPanelNameStr)
-        : wxScrollHelper(this)
-    {
-        Create(parent, id, pos, size, style, name);
-    }
-
-    virtual ~wxGenericScrolledWindow();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxScrolledWindowStyle,
-                const wxString& name = wxPanelNameStr);
-
-    virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
-
-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__
-    #pragma warning(default:4355)
-#endif
+#endif // _WX_GENERIC_SCROLLWIN_H_

 
 

-#endif
-    // _WX_GENERIC_SCROLLWIN_H_