Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Simon Rozman 2016-04-04 13:21:40 +02:00
parent 041ce03f09
commit 80941d968f
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ZRCola/zrcolafrm.cpp
View File

@ -25,9 +25,8 @@
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase) wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
EVT_UPDATE_UI_RANGE(wxZRColaFrame::wxID_SEND, wxZRColaFrame::wxID_SEND_DECOMPOSED, wxZRColaFrame::OnSendUpdate) EVT_UPDATE_UI_RANGE(wxZRColaFrame::wxID_SEND_COMPOSED, wxZRColaFrame::wxID_SEND_DECOMPOSED, wxZRColaFrame::OnSendUpdate)
EVT_MENU(wxZRColaFrame::wxID_SEND , wxZRColaFrame::OnSend )
EVT_MENU(wxZRColaFrame::wxID_SEND_COMPOSED , wxZRColaFrame::OnSendComposed ) EVT_MENU(wxZRColaFrame::wxID_SEND_COMPOSED , wxZRColaFrame::OnSendComposed )
EVT_MENU(wxZRColaFrame::wxID_SEND_DECOMPOSED , wxZRColaFrame::OnSendDecomposed ) EVT_MENU(wxZRColaFrame::wxID_SEND_DECOMPOSED , wxZRColaFrame::OnSendDecomposed )
EVT_MENU(wxZRColaFrame::wxID_SEND_ABORT , wxZRColaFrame::OnSendAbort ) EVT_MENU(wxZRColaFrame::wxID_SEND_ABORT , wxZRColaFrame::OnSendAbort )
@ -38,7 +37,6 @@ wxEND_EVENT_TABLE()
wxZRColaFrame::wxZRColaFrame() : wxZRColaFrame::wxZRColaFrame() :
m_hWndSource(NULL), m_hWndSource(NULL),
m_hotkey(-1),
wxZRColaFrameBase(NULL) wxZRColaFrameBase(NULL)
{ {
// Load main window icons. // Load main window icons.
@ -84,16 +82,6 @@ void wxZRColaFrame::OnSendUpdate(wxUpdateUIEvent& event)
} }
void wxZRColaFrame::OnSend(wxCommandEvent& event)
{
switch (m_hotkey) {
case wxZRColaHKID_INVOKE_COMPOSE : wxZRColaFrame::OnSendComposed (event); break;
case wxZRColaHKID_INVOKE_DECOMPOSE: wxZRColaFrame::OnSendDecomposed(event); break;
default : event.Skip();
}
}
void wxZRColaFrame::OnSendComposed(wxCommandEvent& event) void wxZRColaFrame::OnSendComposed(wxCommandEvent& event)
{ {
if (m_hWndSource) if (m_hWndSource)
@ -119,7 +107,6 @@ void wxZRColaFrame::OnSendAbort(wxCommandEvent& event)
::SetActiveWindow(m_hWndSource); ::SetActiveWindow(m_hWndSource);
::SetForegroundWindow(m_hWndSource); ::SetForegroundWindow(m_hWndSource);
m_hWndSource = NULL; m_hWndSource = NULL;
m_hotkey = -1;
// Select all input in composer to prepare for the overwrite next time. // Select all input in composer to prepare for the overwrite next time.
m_panel->m_decomposed->SelectAll(); m_panel->m_decomposed->SelectAll();
@ -179,7 +166,6 @@ void wxZRColaFrame::DoSend(const wxString& str)
::Sleep(200); ::Sleep(200);
::SendInput(input.size(), input.data(), sizeof(INPUT)); ::SendInput(input.size(), input.data(), sizeof(INPUT));
m_hWndSource = NULL; m_hWndSource = NULL;
m_hotkey = -1;
// Select all input in composer and decomposed to prepare for the overwrite next time. // Select all input in composer and decomposed to prepare for the overwrite next time.
m_panel->m_decomposed->SelectAll(); m_panel->m_decomposed->SelectAll();
@ -207,7 +193,6 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
} }
m_hWndSource = hWndSource; m_hWndSource = hWndSource;
m_hotkey = wParam;
//if (m_state == wxABS_FLOAT) { //if (m_state == wxABS_FLOAT) {
if (IsIconized()) { if (IsIconized()) {

5
ZRCola/zrcolafrm.h
View File

@ -43,8 +43,7 @@ class wxZRColaFrame : public wxZRColaFrameBase
{ {
protected: protected:
enum { enum {
wxID_SEND = wxID_HIGHEST, wxID_SEND_COMPOSED = wxID_HIGHEST,
wxID_SEND_COMPOSED,
wxID_SEND_DECOMPOSED, wxID_SEND_DECOMPOSED,
wxID_SEND_ABORT, wxID_SEND_ABORT,
}; };
@ -55,7 +54,6 @@ public:
protected: protected:
void OnSendUpdate(wxUpdateUIEvent& event); void OnSendUpdate(wxUpdateUIEvent& event);
void OnSend(wxCommandEvent& event);
void OnSendComposed(wxCommandEvent& event); void OnSendComposed(wxCommandEvent& event);
void OnSendDecomposed(wxCommandEvent& event); void OnSendDecomposed(wxCommandEvent& event);
void OnSendAbort(wxCommandEvent& event); void OnSendAbort(wxCommandEvent& event);
@ -71,5 +69,4 @@ protected:
protected: protected:
WXHWND m_hWndSource; ///< handle of the active window, when the ZRCola hotkey was pressed WXHWND m_hWndSource; ///< handle of the active window, when the ZRCola hotkey was pressed
int m_hotkey; ///< hotkey ID that was pressed
}; };