[sword-svn] r169 - trunk/src/SwordReader_GUI

[dtrotzjr at www.crosswire.org]

Author: dtrotzjr
Date: 2008-09-05 14:22:06 -0700 (Fri, 05 Sep 2008)
New Revision: 169

Modified:
   trunk/src/SwordReader_GUI/SRMainFrame.cpp
   trunk/src/SwordReader_GUI/SRModuleView.cpp
   trunk/src/SwordReader_GUI/SRTextView.cpp
   trunk/src/SwordReader_GUI/SRTextView.h
Log:
Fixed issue 0000025 where the last verse was not showing. In this case it was for the rare case where a single chapter took less than a full page of text to display. This time I think this is a fully resolved issue.

Modified: trunk/src/SwordReader_GUI/SRMainFrame.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRMainFrame.cpp	2008-08-03 15:15:18 UTC (rev 168)
+++ trunk/src/SwordReader_GUI/SRMainFrame.cpp	2008-09-05 21:22:06 UTC (rev 169)
@@ -259,6 +259,7 @@
             ::SendMessage(m_hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)m_hWnd);
             ::SendMessage (m_hWnd, WM_CLOSE, 0, 0);
             ::PostQuitMessage(0);
+            break;
         case MENU_TEXT:
             m_viewModules[m_nCurrentModule]->Show();
             m_viewBook->Hide();

Modified: trunk/src/SwordReader_GUI/SRModuleView.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRModuleView.cpp	2008-08-03 15:15:18 UTC (rev 168)
+++ trunk/src/SwordReader_GUI/SRModuleView.cpp	2008-09-05 21:22:06 UTC (rev 169)
@@ -54,7 +54,7 @@
         m_fAbortThread = TRUE;
         rc = WaitForSingleObject(m_hLoadTextThread, INFINITE);
         if(rc != WAIT_FAILED){
-            ::Sleep(100);// Let's sleep for a bit and give the thread a chance to spawn.
+            ::Sleep(200);// Let's sleep for a bit and give the thread a chance to spawn.
             rc = WaitForSingleObject(m_hLoadTextThread, INFINITE);
         }
     }
@@ -182,8 +182,6 @@
 
     if(!fInThread || !m_fAbortThread)
         RefreshWindow();
-    if(fInThread && !m_fAbortThread)
-        PreRenderBuff();
 
     if(done){
         ScrollToVerse(m_verse.Verse());

Modified: trunk/src/SwordReader_GUI/SRTextView.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRTextView.cpp	2008-08-03 15:15:18 UTC (rev 168)
+++ trunk/src/SwordReader_GUI/SRTextView.cpp	2008-09-05 21:22:06 UTC (rev 169)
@@ -453,6 +453,13 @@
     PreRenderBuff(hdc);
     ReleaseDC(m_hWnd, hdc);
 }
+
+void SRTextView::RefreshWindow()
+{
+    PreRenderBuff();
+    SRWnd::RefreshWindow();
+}
+
 VOID SRTextView::PreRenderBuff(HDC hdc)
 {
     SRTextWord   thisWord;

Modified: trunk/src/SwordReader_GUI/SRTextView.h
===================================================================
--- trunk/src/SwordReader_GUI/SRTextView.h	2008-08-03 15:15:18 UTC (rev 168)
+++ trunk/src/SwordReader_GUI/SRTextView.h	2008-09-05 21:22:06 UTC (rev 169)
@@ -692,6 +692,8 @@
     //! Like PreRenderBuff(HDC hdc) except this method gets the device context itself.
     VOID    PreRenderBuff();
 
+    VOID    RefreshWindow();
+
     VOID    ClearFontCache(HDC hdc);
 
     BOOL    Register();