Compare commits
3 Commits
master
...
feature/al
Author | SHA1 | Date | |
---|---|---|---|
c251f568a9 | |||
8c2dd29f39 | |||
360f42868d |
@ -1 +1 @@
|
|||||||
Subproject commit 06230f6ebd386a0e8f559d3857634dfa83cb73e3
|
Subproject commit 320f7e9ee5b96610579639a8096b29158b8b2efd
|
@ -90,7 +90,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
winstd::win_handle m_running; ///< Global Win32 event to determine if another instance of ZRCola is already running
|
winstd::win_handle<NULL> m_running; ///< Global Win32 event to determine if another instance of ZRCola is already running
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -324,6 +324,7 @@ void wxZRColaFrame::OnSendAbort(wxCommandEvent& event)
|
|||||||
{
|
{
|
||||||
if (m_hWndSource) {
|
if (m_hWndSource) {
|
||||||
// Return focus to the source window.
|
// Return focus to the source window.
|
||||||
|
::SetWindowPos(m_hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
|
||||||
if (m_wasIconised) Iconize();
|
if (m_wasIconised) Iconize();
|
||||||
::SetActiveWindow(m_hWndSource);
|
::SetActiveWindow(m_hWndSource);
|
||||||
::SetForegroundWindow(m_hWndSource);
|
::SetForegroundWindow(m_hWndSource);
|
||||||
@ -608,6 +609,7 @@ void wxZRColaFrame::DoSend(const wxString& str)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Return focus to the source window and send the input.
|
// Return focus to the source window and send the input.
|
||||||
|
::SetWindowPos(m_hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
|
||||||
if (m_wasIconised) Iconize();
|
if (m_wasIconised) Iconize();
|
||||||
::SetActiveWindow(m_hWndSource);
|
::SetActiveWindow(m_hWndSource);
|
||||||
::SetForegroundWindow(m_hWndSource);
|
::SetForegroundWindow(m_hWndSource);
|
||||||
@ -629,6 +631,7 @@ void wxZRColaFrame::DoCopyAndReturn(const wxString& str)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Return focus to the source window.
|
// Return focus to the source window.
|
||||||
|
::SetWindowPos(m_hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
|
||||||
if (m_wasIconised) Iconize();
|
if (m_wasIconised) Iconize();
|
||||||
::SetActiveWindow(m_hWndSource);
|
::SetActiveWindow(m_hWndSource);
|
||||||
::SetForegroundWindow(m_hWndSource);
|
::SetForegroundWindow(m_hWndSource);
|
||||||
@ -697,6 +700,7 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
|
|||||||
Show(true);
|
Show(true);
|
||||||
Iconize(false);
|
Iconize(false);
|
||||||
Raise();
|
Raise();
|
||||||
|
::SetWindowPos(m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
|
||||||
::SetActiveWindow(m_hWnd);
|
::SetActiveWindow(m_hWnd);
|
||||||
//} else if (wxAppBarIsDocked(m_state)) {
|
//} else if (wxAppBarIsDocked(m_state)) {
|
||||||
// // ZRCola window is currently docked.
|
// // ZRCola window is currently docked.
|
||||||
|
@ -56,7 +56,7 @@ void ZRCola::DBSource::character_bank::build_related()
|
|||||||
|
|
||||||
|
|
||||||
ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to) :
|
ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to) :
|
||||||
win_handle((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
|
win_handle<INVALID_HANDLE_VALUE>((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
|
||||||
m_heap(HeapCreate(0, 0, 0)),
|
m_heap(HeapCreate(0, 0, 0)),
|
||||||
m_cb(cb),
|
m_cb(cb),
|
||||||
m_from(from),
|
m_from(from),
|
||||||
|
@ -269,14 +269,14 @@ namespace ZRCola {
|
|||||||
void build_related();
|
void build_related();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
class build_related_worker : public winstd::win_handle
|
class build_related_worker : public winstd::win_handle<INVALID_HANDLE_VALUE>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to);
|
build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to);
|
||||||
|
|
||||||
inline void join()
|
inline void join()
|
||||||
{
|
{
|
||||||
if (m_h)
|
if (m_h != invalid)
|
||||||
WaitForSingleObject(m_h, INFINITE);
|
WaitForSingleObject(m_h, INFINITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
Subproject commit 51a82c242fe35b6cc1444cb6c61e8004704c13c8
|
Subproject commit f47faea71bd5f0dec9b549a6ebd6f5a711b805c8
|
Loading…
x
Reference in New Issue
Block a user