From fbca8a050f0252942bd15f50feee152aab7d3f28 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 16 Jun 2016 06:03:32 +0000 Subject: [PATCH] Posix compile fixes git-svn-id: svn://ultimatepp.org/upp/trunk@9949 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/GtkWnd.cpp | 2 +- uppsrc/CtrlCore/X11Wnd.cpp | 2 +- uppsrc/Turtle/Wnd.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/CtrlCore/GtkWnd.cpp b/uppsrc/CtrlCore/GtkWnd.cpp index 54cfcc215..da21ed9ff 100644 --- a/uppsrc/CtrlCore/GtkWnd.cpp +++ b/uppsrc/CtrlCore/GtkWnd.cpp @@ -128,7 +128,7 @@ Ctrl *Ctrl::GetActiveCtrl() // There is no generic support in GTK for HotKey -int Ctrl::RegisterSystemHotKey(dword key, Callback cb) +int Ctrl::RegisterSystemHotKey(dword key, Function cb) { return -1; } diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp index a5c271282..9340553d8 100644 --- a/uppsrc/CtrlCore/X11Wnd.cpp +++ b/uppsrc/CtrlCore/X11Wnd.cpp @@ -177,7 +177,7 @@ Vector Ctrl::hotkey; Vector Ctrl::keyhot; Vector Ctrl::modhot; -int Ctrl::RegisterSystemHotKey(dword key, Callback cb) +int Ctrl::RegisterSystemHotKey(dword key, Function cb) { GuiLock __; ASSERT(key >= K_DELTA); diff --git a/uppsrc/Turtle/Wnd.cpp b/uppsrc/Turtle/Wnd.cpp index 3d5e11859..1636c3fcd 100644 --- a/uppsrc/Turtle/Wnd.cpp +++ b/uppsrc/Turtle/Wnd.cpp @@ -90,7 +90,7 @@ Ctrl *Ctrl::GetActiveCtrl() // Vector Ctrl::hotkey; -int Ctrl::RegisterSystemHotKey(dword key, Callback cb) +int Ctrl::RegisterSystemHotKey(dword key, Function cb) { /* ASSERT(key >= K_DELTA); int q = hotkey.GetCount();