diff options
author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2009-11-06 18:53:26 +0000 |
---|---|---|
committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2009-11-06 18:53:26 +0000 |
commit | 8acda009d921a65dab87bd0a40f63981a1586561 (patch) | |
tree | a0ecc03e12f81439243bc537e565502ab5af3ba1 /ui.h | |
parent | 300d4608f2504e3e4a02a13b6c6000b52c436975 (diff) | |
download | bitcoin-8acda009d921a65dab87bd0a40f63981a1586561.tar.xz |
UIThreadCall, ThreadSafeMessageBox
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@34 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'ui.h')
-rw-r--r-- | ui.h | 22 |
1 files changed, 4 insertions, 18 deletions
@@ -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()
};
-
-
-
-
-
-
|