Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / radiant / xywindow.h

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index 41fb89f89b9b053d6ce663a4687ce9fb3e722156..e23b4bd79280f24332ef74993cb0bbda61e205a4 100644 (file)
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -119,7 +119,7 @@ void Move_End();
 bool m_move_started;
 guint m_move_focusOut;
 
-void Zoom_Begin();
+void Zoom_Begin( int x, int y );
 void Zoom_End();
 bool m_zoom_started;
 guint m_zoom_focusOut;
@@ -127,6 +127,7 @@ guint m_zoom_focusOut;
 void ZoomIn();
 void ZoomOut();
 void ZoomInWithMouse( int pointx, int pointy );
+void FocusOnBounds( AABB& bounds );
 
 void Redraw();
 
@@ -252,6 +253,7 @@ inline void XYWnd_Update( XYWnd& xywnd ){
        xywnd.queueDraw();
 }
 
+void XY_Centralize();
 
 struct xywindow_globals_t
 {
@@ -272,7 +274,7 @@ struct xywindow_globals_t
 
 //     bool m_bRightClick;
        bool m_bNoStipple;
-       bool m_bImprovedWheelZoom;
+       bool m_bZoomInToPointer;
 
        xywindow_globals_t() :
                color_gridback( 0.77f, 0.77f, 0.77f ),
@@ -292,7 +294,7 @@ struct xywindow_globals_t
                AxisColorZ( 0.f, 0.f, 1.f ),
 //             m_bRightClick( true ),
                m_bNoStipple( true ),
-               m_bImprovedWheelZoom( true ){
+               m_bZoomInToPointer( true ){
        }
 
 };