[sword-svn] r139 - in trunk/src/SwordReader_GUI: . SRFramework

[dtrotzjr at www.crosswire.org]

Author: dtrotzjr
Date: 2008-05-23 21:42:38 -0700 (Fri, 23 May 2008)
New Revision: 139

Modified:
   trunk/src/SwordReader_GUI/SRFramework/SRWnd.cpp
   trunk/src/SwordReader_GUI/SRFramework/SRWnd.h
   trunk/src/SwordReader_GUI/SRMainFrame.cpp
   trunk/src/SwordReader_GUI/SRReaderApp.cpp
Log:
Fixed Focus problem when returning from the find dialog.

Modified: trunk/src/SwordReader_GUI/SRFramework/SRWnd.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRFramework/SRWnd.cpp	2008-05-23 04:08:02 UTC (rev 138)
+++ trunk/src/SwordReader_GUI/SRFramework/SRWnd.cpp	2008-05-24 04:42:38 UTC (rev 139)
@@ -97,6 +97,11 @@
     return m_hWnd;
 }
 
+VOID SRWnd::SetFocus()
+{
+    ::SetFocus(m_hWnd);
+}
+
 LRESULT CALLBACK SRWnd::WndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam)
 {
     switch(wMsg)

Modified: trunk/src/SwordReader_GUI/SRFramework/SRWnd.h
===================================================================
--- trunk/src/SwordReader_GUI/SRFramework/SRWnd.h	2008-05-23 04:08:02 UTC (rev 138)
+++ trunk/src/SwordReader_GUI/SRFramework/SRWnd.h	2008-05-24 04:42:38 UTC (rev 139)
@@ -47,6 +47,7 @@
         virtual void RefreshWindow();
         virtual void MoveWindow(int x, int y, int nWidth, int nHeight, BOOL bRepaint = TRUE);
         virtual void MoveWindow(LPCRECT lpRect,BOOL bRepaint = TRUE);
+        virtual void SetFocus();
 
         virtual LRESULT OnMove(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam) { return OnMove(LOWORD(lParam), HIWORD(lParam)); }
         virtual BOOL OnMove(int x, int y) { return FALSE; }

Modified: trunk/src/SwordReader_GUI/SRMainFrame.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRMainFrame.cpp	2008-05-23 04:08:02 UTC (rev 138)
+++ trunk/src/SwordReader_GUI/SRMainFrame.cpp	2008-05-24 04:42:38 UTC (rev 139)
@@ -344,6 +344,7 @@
             m_viewVerse->Hide();
             m_viewFind->Hide();
             LoadTextView();
+            SetFocus();
             break;
         case MENU_BOOK:
             m_viewBook->Show();

Modified: trunk/src/SwordReader_GUI/SRReaderApp.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRReaderApp.cpp	2008-05-23 04:08:02 UTC (rev 138)
+++ trunk/src/SwordReader_GUI/SRReaderApp.cpp	2008-05-24 04:42:38 UTC (rev 139)
@@ -34,6 +34,9 @@
 		if((msg.message == WM_LBUTTONDOWN || msg.message == WM_KEYDOWN) && (ignoreMsgs || msg.time < ignoreTill))
 			continue;
 
+        if(msg.message == WM_TIMER)
+            continue;
+
 		if (!m_hAccelTable || !TranslateAccelerator(msg.hwnd, m_hAccelTable, &msg)) 
 		{
 			TranslateMessage(&msg);