implemented nested index entries and index entries pointing to multiple documents...

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index e667b760e05d15b026b65cb57fcdd18a2dc8be3e..bedce4cc7673ac328ba4816945251b12fda4f6bc 100644 (file)
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -6,13 +6,13 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_SCROLLWIN_H_
 #define _WX_GTK_SCROLLWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "scrolwin.h"
 #endif
 
@@ -63,7 +63,7 @@ public:
     // the area between the scrollbars (spreadsheet: only cell area
     // will move).
     virtual void SetTargetWindow( wxWindow *target, bool pushEventHandler = FALSE );
-    virtual wxWindow *GetTargetWindow();
+    virtual wxWindow *GetTargetWindow() const;
 
     // Set the scrolled area of the window.
     virtual void DoSetVirtualSize( int x, int y );
@@ -90,7 +90,7 @@ public:
     virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
 
     // Enable/disable Windows scrolling in either direction.
-    // If TRUE, wxWindows scrolls the canvas and only a bit of
+    // If TRUE, wxWidgets scrolls the canvas and only a bit of
     // the canvas is invalidated; no Clear() is necessary.
     // If FALSE, the whole canvas is invalidated and a Clear() is
     // necessary. Disable for when the scroll increment is used
@@ -156,7 +156,7 @@ public:
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
 
-    // Overridden from wxWindows due callback being static
+    // Overridden from wxWidgets due callback being static
     virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
 
 #if WXWIN_COMPATIBILITY_2_2