Kaydet (Commit) 0bdfde69 authored tarafından Caolán McNamara's avatar Caolán McNamara

they are xbms, not xpms, hence my bafflement

üst 83a5d1ee
...@@ -95,7 +95,7 @@ class GtkSalDisplay : public SalDisplay ...@@ -95,7 +95,7 @@ class GtkSalDisplay : public SalDisplay
bool m_bStartupCompleted; bool m_bStartupCompleted;
std::vector< int > m_aXineramaScreenIndexMap; 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 ); int nWidth, int nHeight, int nXHot, int nYHot );
public: public:
GtkSalDisplay( GdkDisplay* pDisplay ); GtkSalDisplay( GdkDisplay* pDisplay );
......
...@@ -362,7 +362,7 @@ namespace ...@@ -362,7 +362,7 @@ namespace
} }
#endif #endif
GdkCursor* GtkSalDisplay::getFromXPM( const unsigned char *pBitmap, GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap,
const unsigned char *pMask, const unsigned char *pMask,
int nWidth, int nHeight, int nWidth, int nHeight,
int nXHot, int nYHot ) int nXHot, int nYHot )
...@@ -420,7 +420,7 @@ GdkCursor* GtkSalDisplay::getFromXPM( const unsigned char *pBitmap, ...@@ -420,7 +420,7 @@ GdkCursor* GtkSalDisplay::getFromXPM( const unsigned char *pBitmap,
#define MAKE_CURSOR( vcl_name, name ) \ #define MAKE_CURSOR( vcl_name, name ) \
case vcl_name: \ case vcl_name: \
pCursor = getFromXPM( name##curs##_bits, name##mask##_bits, \ pCursor = getFromXBM( name##curs##_bits, name##mask##_bits, \
name##curs_width, name##curs_height, \ name##curs_width, name##curs_height, \
name##curs_x_hot, name##curs_y_hot ); \ name##curs_x_hot, name##curs_y_hot ); \
break break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment