summaryrefslogtreecommitdiffstats
path: root/vcl/inc/unx/gtk/gtkdata.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-21 18:56:16 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-21 18:56:16 +0200
commita233dac0653f3f3054f7ad2da114ed989747e89a (patch)
treebf1e11438321c06125a94308649c496648061ccb /vcl/inc/unx/gtk/gtkdata.hxx
parentnot link cairocanvas against stl anymore (diff)
parentcallcatcher: clean up Dir and DirEntry (diff)
downloadcore-a233dac0653f3f3054f7ad2da114ed989747e89a.tar.gz
core-a233dac0653f3f3054f7ad2da114ed989747e89a.zip
resyncing to master
Diffstat (limited to 'vcl/inc/unx/gtk/gtkdata.hxx')
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 307a3f2b3e01..24860b8f80df 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -93,9 +93,8 @@ class GtkSalDisplay : public SalDisplay
GdkDisplay* m_pGdkDisplay;
GdkCursor *m_aCursors[ POINTER_COUNT ];
bool m_bStartupCompleted;
- std::vector< int > m_aXineramaScreenIndexMap;
- GdkCursor* getFromXPM( const unsigned char *pBitmap, const unsigned char *pMask,
+ GdkCursor* getFromXBM( const unsigned char *pBitmap, const unsigned char *pMask,
int nWidth, int nHeight, int nXHot, int nYHot );
public:
GtkSalDisplay( GdkDisplay* pDisplay );