Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 4b300792f1c84933e3d31bca1fbd1e042be80ef2..199c4b7ef3d76b29220b7fd8ab05ef909609b648 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1221,11 +1221,7 @@ public:
     // ----------
 
         // can the window have the scrollbar in this orientation?
     // ----------
 
         // can the window have the scrollbar in this orientation?

-    bool CanScroll(int orient) const
-    {
-        return (m_windowStyle &
-                (orient == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL)) != 0;
-    }
+    virtual bool CanScroll(int orient) const;

 
         // does the window have the scrollbar in this orientation?
     bool HasScrollbar(int orient) const;
 
         // does the window have the scrollbar in this orientation?
     bool HasScrollbar(int orient) const;


@@ -1830,15 +1826,6 @@ private:
     // base for dialog unit conversion, i.e. average character size
     wxSize GetDlgUnitBase() const;
 
     // base for dialog unit conversion, i.e. average character size
     wxSize GetDlgUnitBase() const;
 

-    // the stack of windows which have captured the mouse
-    static struct WXDLLIMPEXP_FWD_CORE wxWindowNext *ms_winCaptureNext;
-
-    // the window that currently has mouse capture
-    static wxWindow *ms_winCaptureCurrent;
-
-    // indicates if execution is inside CaptureMouse/ReleaseMouse
-    static bool ms_winCaptureChanging;
-

 
     // number of Freeze() calls minus the number of Thaw() calls: we're frozen
     // (i.e. not being updated) if it is positive
 
     // number of Freeze() calls minus the number of Thaw() calls: we're frozen
     // (i.e. not being updated) if it is positive