X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..94fa33a0edde27c4fe11c84ccfeb39f5ba6fa64e:/include/wx/msw/window.h?ds=sidebyside

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index ccd6f259c4..27432a415d 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -28,14 +28,6 @@
 // a better solution should be found later...
 #define wxUSE_MOUSEEVENT_HACK 0
 
-// when building wxUniv/MSW we don't want the code for native menu use to be
-// compiled in - it should only be used when building real wxMSW
-#ifdef __WXUNIVERSAL__
-    #define wxUSE_MENUS_NATIVE 0
-#else // __WXMSW__
-    #define wxUSE_MENUS_NATIVE wxUSE_MENUS
-#endif // __WXUNIVERSAL__/__WXMSW__
-
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
@@ -98,6 +90,8 @@ public:
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Update();
     virtual void Clear();
+    virtual void Freeze();
+    virtual void Thaw();
 
     virtual bool SetCursor( const wxCursor &cursor );
     virtual bool SetFont( const wxFont &font );
@@ -124,6 +118,9 @@ public:
     virtual void ScrollWindow( int dx, int dy,
                                const wxRect* rect = (wxRect *) NULL );
 
+    virtual bool ScrollLines(int lines);
+    virtual bool ScrollPages(int pages);
+
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 #endif // wxUSE_DRAG_AND_DROP