From 8acda009d921a65dab87bd0a40f63981a1586561 Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Fri, 6 Nov 2009 18:53:26 +0000
Subject: UIThreadCall, ThreadSafeMessageBox

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@34 1a98c847-1fd6-4fd8-948a-caf3550aa51b
---
 ui.h | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'ui.h')

diff --git a/ui.h b/ui.h
index 1d0491f109..1db40997f4 100644
--- a/ui.h
+++ b/ui.h
@@ -5,19 +5,10 @@
 
 
 
-DECLARE_EVENT_TYPE(wxEVT_CROSSTHREADCALL, -1)
+DECLARE_EVENT_TYPE(wxEVT_UITHREADCALL, -1)
 DECLARE_EVENT_TYPE(wxEVT_REPLY1, -1)
 DECLARE_EVENT_TYPE(wxEVT_REPLY2, -1)
 DECLARE_EVENT_TYPE(wxEVT_REPLY3, -1)
-DECLARE_EVENT_TYPE(wxEVT_TABLEADDED, -1)
-DECLARE_EVENT_TYPE(wxEVT_TABLEUPDATED, -1)
-DECLARE_EVENT_TYPE(wxEVT_TABLEDELETED, -1)
-
-enum
-{
-    UICALL_ADDORDER = 1,
-    UICALL_UPDATEORDER,
-};
 
 
 
@@ -33,9 +24,10 @@ extern int fMinimizeOnClose;
 
 extern void HandleCtrlA(wxKeyEvent& event);
 extern string FormatTxStatus(const CWalletTx& wtx);
-extern void CrossThreadCall(int nID, void* pdata);
+extern void UIThreadCall(boost::function<void ()>);
 extern void MainFrameRepaint();
 extern void Shutdown(void* parg);
+extern int ThreadSafeMessageBox(const string& message, const string& caption="Message", int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1);
 
 
 
@@ -85,7 +77,7 @@ public:
     unsigned int nListViewUpdated;
     bool fRefresh;
 
-    void OnCrossThreadCall(wxCommandEvent& event);
+    void OnUIThreadCall(wxCommandEvent& event);
     int GetSortIndex(const string& strSort);
     void InsertLine(bool fNew, int nIndex, uint256 hashKey, string strSort, const wxString& str1, const wxString& str2, const wxString& str3, const wxString& str4, const wxString& str5);
     bool DeleteLine(uint256 hashKey);
@@ -473,9 +465,3 @@ public:
 
 DECLARE_EVENT_TABLE()
 };
-
-
-
-
-
-
-- 
cgit v1.2.3