X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..5dc43d1fc5bdac58ac689364b74118ea67285305:/include/wx/gtk1/scrolwin.h diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h index cf8854cf56..bedce4cc76 100644 --- a/include/wx/gtk1/scrolwin.h +++ b/include/wx/gtk1/scrolwin.h @@ -12,7 +12,7 @@ #ifndef _WX_GTK_SCROLLWIN_H_ #define _WX_GTK_SCROLLWIN_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#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