[Libreoffice-commits] core.git: vcl/inc

[Caolán McNamara]

 vcl/inc/unx/salframe.h |   22 +++++++++++++++-------
 vcl/inc/unx/salvd.h    |   26 +++++++++++++++++++-------
 2 files changed, 34 insertions(+), 14 deletions(-)

New commits:
commit 84972949a3501003b0b6ad98f07f1b4ab83f3ca1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 2 10:24:18 2013 +0000

    fix build
    
    Change-Id: I24e5ad4f27584aa982fa8a4d7ee80e7167bbcacf

diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index eb11699..bb6253f 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -25,7 +25,7 @@
 
 #include <unx/salunx.h>
 #include <unx/saltype.h>
-
+#include <unx/saldisp.hxx>
 #include <salframe.hxx>
 #include <salwtype.hxx>
 #include <salinst.hxx>
@@ -37,7 +37,6 @@
 
 #include <list>
 
-class   SalDisplay;
 class   X11SalGraphics;
 class   SalI18N_InputContext;
 
@@ -171,9 +170,18 @@ public:
     void            Init( sal_uIntPtr nSalFrameStyle, SalX11Screen nScreen = SalX11Screen( -1 ),
                           SystemParentData* pParentData = NULL, bool bUseGeometry = false );
 
-    SalDisplay*             GetDisplay() const { return pDisplay_; }
-    Display*                GetXDisplay() const;
-    XLIB_Window             GetDrawable() const;
+    SalDisplay* GetDisplay() const
+    {
+        return pDisplay_;
+    }
+    Display *GetXDisplay() const
+    {
+        return pDisplay_->GetDisplay();
+    }
+    XLIB_Window GetDrawable() const
+    {
+        return GetWindow();
+    }
     SalX11Screen            GetScreenNumber() const { return m_nXScreen; }
     XLIB_Window             GetWindow() const { return mhWindow; }
     XLIB_Window             GetShellWindow() const { return mhShellWindow; }
@@ -183,8 +191,8 @@ public:
     long                    Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); }
               sal_uIntPtr           GetStyle() const { return nStyle_; }
 
-    inline  XLIB_Cursor     GetCursor() const { return hCursor_; }
-    inline  sal_Bool            IsCaptured() const { return nCaptured_ == 1; }
+    XLIB_Cursor     GetCursor() const { return hCursor_; }
+    sal_Bool            IsCaptured() const { return nCaptured_ == 1; }
 #if !defined(__synchronous_extinput__)
     void            HandleExtTextEvent (XClientMessageEvent *pEvent);
 #endif
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index 198bdf8..fe6afd4 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -54,13 +54,24 @@ public:
                               SalX11Screen nXScreen,
                               Pixmap hDrawable = None,
                               XRenderPictFormat* pXRenderFormat = NULL );
-    inline  void            InitGraphics( X11SalVirtualDevice *pVD );
-
-    inline  Display        *GetXDisplay() const;
-    inline  SalDisplay     *GetDisplay() const;
-    inline  sal_Bool        IsDisplay() const;
-    inline  Pixmap          GetDrawable() const { return hDrawable_; }
-    inline  sal_uInt16      GetDepth() const { return nDepth_; }
+    void InitGraphics( X11SalVirtualDevice *pVD )
+    {
+        pGraphics_->Init( pVD );
+    }
+    Display *GetXDisplay() const
+    {
+        return pDisplay_->GetDisplay();
+    }
+    SalDisplay *GetDisplay() const
+    {
+        return pDisplay_;
+    }
+    sal_Bool IsDisplay() const
+    {
+        return pDisplay_->IsDisplay();
+    }
+    Pixmap          GetDrawable() const { return hDrawable_; }
+    sal_uInt16      GetDepth() const { return nDepth_; }
     int                     GetWidth() const { return nDX_; }
     int                     GetHeight() const { return nDY_; }
     SalX11Screen            GetXScreenNumber() const { return m_nXScreen; }
@@ -73,6 +84,7 @@ public:
     virtual void            GetSize( long& rWidth, long& rHeight );
 };
 
+
 #endif // INCLUDED_VCL_INC_UNX_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */