From d39f7c5c6f4ca8d4d23a20f9e1d11d4167a70bbe Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Sun, 18 May 2014 17:33:00 +0200 Subject: Added missing ; under win32. --- plugingui/directory.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugingui') diff --git a/plugingui/directory.cc b/plugingui/directory.cc index d481d24..61b1441 100644 --- a/plugingui/directory.cc +++ b/plugingui/directory.cc @@ -320,7 +320,7 @@ bool Directory::isHidden(std::string path) { // TODO: Handle hidden and system files in windows #ifdef WIN32 - return false + return false; #else unsigned pos = path.find_last_of("/\\"); std::string entry = path.substr(pos+1); -- cgit v1.2.3 From 19400c849e51b66fe1ed0181b05fc51f9254648b Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 5 Jun 2014 14:59:23 +0200 Subject: Don't include direct.h unless we're compiling wityh mingw (ie. not cygwin) --- plugingui/filebrowser.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugingui') 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 -#ifdef WIN32 +#ifdef __MINGW32__ #include #endif -- cgit v1.2.3 From 69e020ea53dcfe71f91a3de46e4ce4a05cefafc5 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 5 Jun 2014 15:03:40 +0200 Subject: Don't include direct.h unless we're compiling wityh mingw (ie. not cygwin) --- plugingui/filebrowser.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugingui') diff --git a/plugingui/filebrowser.cc b/plugingui/filebrowser.cc index 6ecbc09..3d49244 100644 --- a/plugingui/filebrowser.cc +++ b/plugingui/filebrowser.cc @@ -42,7 +42,7 @@ #include #ifdef __MINGW32__ -#include +//#include #endif struct GUI::FileBrowser::private_data { -- cgit v1.2.3 From b91fe74814c2217072860611d0b9c2d645db6b9b Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 5 Jun 2014 15:08:23 +0200 Subject: Don't include direct.h unless we're compiling wityh mingw (ie. not cygwin) --- plugingui/directory.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugingui') diff --git a/plugingui/directory.cc b/plugingui/directory.cc index 61b1441..9ebfe70 100644 --- a/plugingui/directory.cc +++ b/plugingui/directory.cc @@ -34,7 +34,9 @@ #include #ifdef WIN32 +#ifdef __MINGW32__ #include +#endif #include #endif -- cgit v1.2.3 From 2d75401b3b53f39c0a5ee7eba0b95fa9ce7dde15 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 5 Jun 2014 18:53:45 +0200 Subject: Revert inclusion removal --- plugingui/filebrowser.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugingui') diff --git a/plugingui/filebrowser.cc b/plugingui/filebrowser.cc index 3d49244..6ecbc09 100644 --- a/plugingui/filebrowser.cc +++ b/plugingui/filebrowser.cc @@ -42,7 +42,7 @@ #include #ifdef __MINGW32__ -//#include +#include #endif struct GUI::FileBrowser::private_data { -- cgit v1.2.3 From 24a2abd140e81c93c11ace0f5f5bbe05361635ff Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 18 Jul 2014 22:41:55 +0200 Subject: Change Set/GetWindowLong to Set/GetWindowLongPtr. --- plugingui/nativewindow_win32.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugingui') 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() -- cgit v1.2.3