openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Merge branch 'linux' into merge_linux

Browse Source
This commit is contained in:
Michael Bonfils
2018-02-08 20:36:46 +01:00
parent cb9f0eda53 75c3fd55ea
commit d940f2c39d
128 changed files with 1618 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/cursors.win.cpp
View File

@@ -46,7 +46,7 @@ static void GetMaskBitmaps(const sf::Image& srcImage, HBITMAP& hAndMaskBitmap, H
ReleaseDC(NULL, hDC);
}
Cursor::Cursor(fs::path imgPath, float hotSpotX, float hotSpotY) {
cCursor::cCursor(fs::path imgPath, float hotSpotX, float hotSpotY) {
sf::Image gif;
if(!gif.loadFromFile(imgPath.string())) {
std::string error = "Error loading cursor from " + imgPath.string();
@@ -75,12 +75,12 @@ Cursor::Cursor(fs::path imgPath, float hotSpotX, float hotSpotY) {
DeleteObject(cursorXor);
}
Cursor::~Cursor() {
cCursor::~cCursor() {
HCURSOR curs = (HCURSOR)ptr;
DestroyIcon(curs);
}
void Cursor::apply() {
void cCursor::apply() {
HCURSOR curs = (HCURSOR)ptr;
SetCursor(curs);
}
@@ -95,7 +95,7 @@ void set_cursor(cursor_type which_c) {
if(which_c == text_curs) {
SetCursor(LoadCursor(NULL, IDC_IBEAM));
} else {
Cursor& curs = *ResMgr::get<CursorRsrc>(cursors[which_c]);
cCursor& curs = *ResMgr::get<CursorRsrc>(cursors[which_c]);
curs.apply();
}
}