diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-10-12 21:19:48 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-10-12 21:19:48 +0200 |
| commit | adc6d371af2cf356578fee6be0711d6db7f31288 (patch) | |
| tree | 969a2b081f5089168a798dd945a8e0b287d02f8d /plugingui | |
| parent | fafc815d3b2f525e703ab9482a008201097ab90d (diff) | |
| parent | 32d9c872e7abdaedb497e7403a44470676838ecb (diff) | |
Merge in from master.
Diffstat (limited to 'plugingui')
| -rw-r--r-- | plugingui/filebrowser.cc | 2 | ||||
| -rw-r--r-- | plugingui/nativewindow_win32.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugingui/filebrowser.cc b/plugingui/filebrowser.cc index e9eca6c..6ecbc09 100644 --- a/plugingui/filebrowser.cc +++ b/plugingui/filebrowser.cc @@ -41,7 +41,7 @@ #include <hugin.hpp> -#ifdef WIN32 +#ifdef __MINGW32__ #include <direct.h> #endif diff --git a/plugingui/nativewindow_win32.cc b/plugingui/nativewindow_win32.cc index 89844da..871bafe 100644 --- a/plugingui/nativewindow_win32.cc +++ b/plugingui/nativewindow_win32.cc @@ -33,7 +33,7 @@ LRESULT CALLBACK dialogProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { GUI::NativeWindowWin32 *native = - (GUI::NativeWindowWin32 *)GetWindowLong(hwnd, GWL_USERDATA); + (GUI::NativeWindowWin32 *)GetWindowLongPtr(hwnd, GWLP_USERDATA); // NOTE: 'native' is NULL intil the WM_CREATE message has been handled. if(!native) return DefWindowProc(hwnd, msg, wp, lp); @@ -311,7 +311,7 @@ GUI::NativeWindowWin32::NativeWindowWin32(GUI::Window *window) wndId, NULL, GetModuleHandle(NULL), NULL); - SetWindowLongPtr(m_hwnd, GWL_USERDATA, (LONG_PTR)this); + SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this); } GUI::NativeWindowWin32::~NativeWindowWin32() |