diff -r 2a6157d381fe -r 4c3e9fa0093b mapeditor.cpp --- a/mapeditor.cpp Mon Apr 10 11:00:19 2006 +0000 +++ b/mapeditor.cpp Mon Apr 10 11:00:23 2006 +0000 @@ -125,6 +125,8 @@ extern Settings settings; +extern QString iconPath; + int MapEditor::mapNum=0; // make instance /////////////////////////////////////////////////////////////////////// @@ -168,22 +170,13 @@ // Create bitmap cursors, patform dependant #if defined(Q_OS_MACX) - #include "icons/cursorhandopen16.xpm" - #include "icons/cursorcolorpicker16.xpm" - QBitmap cb( 16, 16, chandopen, TRUE ); - QBitmap cm( 16, 16, chandopenmask, TRUE ); - handOpenCursor=QCursor ( cb, cm ); + handOpenCursor=QCursor ( QPixmap(iconPath+"cursorhandopen16.png") ); // set hot spot to tip of picker - pickColorCursor=QCursor ( cursorcolorpicker_xpm, 1,15 ); + pickColorCursor=QCursor ( QPixmap (iconPath+"cursorcolorpicker16.png"), 1,15 ); #else - #include "icons/cursorhandopen.xpm" - #include "icons/cursorcolorpicker.xpm" - - QBitmap cb( 32, 32, chandopen, TRUE ); - QBitmap cm( 32, 32, chandopenmask, TRUE ); - handOpenCursor=QCursor ( cb, cm ); + handOpenCursor=QCursor (QPixmap(iconPath+"cursorhandopen16.png")); // set hot spot to tip of picker - pickColorCursor=QCursor ( cursorcolorpicker_xpm, 5,27 ); + pickColorCursor=QCursor ( QPixmap(iconPath+"cursorcolorpicker.png"), 5,27 ); #endif pickingColor=false;