reapack

commit 78c2d44a9322f5598a23adb3917de6116c072935
parent cf85ea92a2375c7b6c40c2a45ce368b0fd73ab48
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Fri,  1 Jan 2016 15:55:47 -0500

fix building the context menu code on Windows

Diffstat:
M
src/dialog.cpp
 | 
4
++--
M
src/dialog.hpp
 | 
2
+-
M
src/manager.cpp
 | 
4
++--
M
src/manager.hpp
 | 
2
+-

4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/dialog.cpp b/src/dialog.cpp
@@ -62,7 +62,7 @@ WDL_DLGRET Dialog::Proc(HWND handle, UINT msg, WPARAM wParam, LPARAM lParam)
     dlg->onNotify((LPNMHDR)lParam, lParam);
     break;
   case WM_CONTEXTMENU:
-    dlg->onContextMenu((HWND)wParam, lParam);
+    dlg->onContextMenu((HWND)wParam, LOWORD(lParam), HIWORD(lParam));
     break;
   case WM_DESTROY:
     dlg->onDestroy();
@@ -188,7 +188,7 @@ void Dialog::onNotify(LPNMHDR, LPARAM)
 {
 }
 
-void Dialog::onContextMenu(HWND, LPARAM)
+void Dialog::onContextMenu(HWND, int, int)
 {
 }
 
diff --git a/src/dialog.hpp b/src/dialog.hpp
@@ -81,7 +81,7 @@ protected:
   virtual void onTimer();
   virtual void onCommand(WPARAM, LPARAM);
   virtual void onNotify(LPNMHDR, LPARAM);
-  virtual void onContextMenu(HWND, LPARAM);
+  virtual void onContextMenu(HWND, int x, int y);
   virtual void onDestroy();
 
 private:
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -77,7 +77,7 @@ void Manager::onNotify(LPNMHDR info, LPARAM lParam)
   }
 }
 
-void Manager::onContextMenu(HWND target, LPARAM lParam)
+void Manager::onContextMenu(HWND target, const int x, const int y)
 {
   if(target != m_list->handle())
     return;
@@ -102,7 +102,7 @@ void Manager::onContextMenu(HWND target, LPARAM lParam)
     menu.enable(uninstallAction);
   }
 
-  menu.show(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), handle());
+  menu.show(x, y, handle());
 }
 
 void Manager::refresh()
diff --git a/src/manager.hpp b/src/manager.hpp
@@ -36,7 +36,7 @@ protected:
   void onInit() override;
   void onCommand(WPARAM, LPARAM) override;
   void onNotify(LPNMHDR, LPARAM) override;
-  void onContextMenu(HWND, LPARAM) override;
+  void onContextMenu(HWND, int x, int y) override;
 
 private:
   void selectionChanged();