do not rename() .map symlinks, but just overwrite them

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

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index 66709784af2ba5bcfdf93d1b257949b27e9b81c9..ac059329518178de2d63c32843579c56352f6be8 100644 (file)
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -40,7 +40,6 @@ namespace scene
 {
 class Node;
 }
-typedef struct _GtkMenu GtkMenu;
 
 
 void FlipClip();
@@ -64,7 +63,7 @@ inline const char* ViewType_getTitle( VIEWTYPE viewtype ){
 
 class XYWnd
 {
-ui::Widget m_gl_widget;
+ui::GLArea m_gl_widget;
 guint m_sizeHandler;
 guint m_exposeHandler;
 
@@ -78,7 +77,7 @@ XYWnd();
 void queueDraw(){
        m_deferredDraw.draw();
 }
-ui::Widget GetWidget(){
+ui::GLArea GetWidget(){
        return m_gl_widget;
 }
 
@@ -125,6 +124,8 @@ void Zoom_End();
 bool m_zoom_started;
 guint m_zoom_focusOut;
 
+void Redraw();
+
 void SetActive( bool b ){
        m_bActive = b;
 };
@@ -141,7 +142,7 @@ void DropClipPoint( int pointx, int pointy );
 void SetViewType( VIEWTYPE n );
 bool m_bActive;
 
-static GtkMenu* m_mnuDrop;
+static ui::Menu m_mnuDrop;
 
 int m_chasemouse_current_x, m_chasemouse_current_y;
 int m_chasemouse_delta_x, m_chasemouse_delta_y;
@@ -151,8 +152,8 @@ guint m_chasemouse_handler;
 void ChaseMouse();
 bool chaseMouseMotion( int pointx, int pointy );
 
-void updateModelview();
-void updateProjection();
+void updateModelview(bool reconstruct = true);
+void updateProjection(bool reconstruct = true);
 Matrix4 m_projection;
 Matrix4 m_modelview;
 
@@ -225,7 +226,7 @@ int Height(){
 Signal0 onDestroyed;
 Signal3<const WindowVector&, ButtonIdentifier, ModifierFlags> onMouseDown;
 void mouseDown( const WindowVector& position, ButtonIdentifier button, ModifierFlags modifiers );
-typedef Member3<XYWnd, const WindowVector&, ButtonIdentifier, ModifierFlags, void, &XYWnd::mouseDown> MouseDownCaller;
+typedef Member<XYWnd, void(const WindowVector&, ButtonIdentifier, ModifierFlags), &XYWnd::mouseDown> MouseDownCaller;
 };
 
 inline void XYWnd_Update( XYWnd& xywnd ){