renamed wxWave to wxSound

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 0808cbb2b34fe775a120578d41a5bd0a54203485..faf66d635aad490cc9a6d952408a03e4b88245e1 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -5,14 +5,14 @@
 // 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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #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
@@ -45,20 +45,20 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
 public:
     wxGenericScrolledWindow() : wxScrollHelper(this) { }
     wxGenericScrolledWindow(wxWindow *parent,
-                     wxWindowID id = -1,
+                     wxWindowID winid = -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);
+        Create(parent, winid, pos, size, style, name);
     }
 
     virtual ~wxGenericScrolledWindow();
 
     bool Create(wxWindow *parent,
-                wxWindowID id,
+                wxWindowID winid,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxScrolledWindowStyle,
@@ -66,9 +66,11 @@ public:
 
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
 
-        // lay out the window and its children
+    // 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()
@@ -81,7 +83,7 @@ protected:
 #endif // __WXMSW__
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericScrolledWindow)
     DECLARE_EVENT_TABLE()
 };
 
@@ -91,3 +93,4 @@ private:
 
 #endif
     // _WX_GENERIC_SCROLLWIN_H_
+