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

Sun Feb 1 15:59:23 MST 2009

Author: dtrotzjr
Date: 2009-02-01 15:59:23 -0700 (Sun, 01 Feb 2009)
New Revision: 208

Modified:
   trunk/src/SwordReader_GUI/SRAboutView.cpp
   trunk/src/SwordReader_GUI/SRMainFrame.cpp
   trunk/src/SwordReader_GUI/SRTextView.cpp
Log:
Fixed a font change issue that would creep up in the strangest of places.

Modified: trunk/src/SwordReader_GUI/SRAboutView.cpp
===================================================================

--- trunk/src/SwordReader_GUI/SRAboutView.cpp	2009-02-01 19:28:44 UTC (rev 207)
+++ trunk/src/SwordReader_GUI/SRAboutView.cpp	2009-02-01 22:59:23 UTC (rev 208)
@@ -4,7 +4,7 @@
 
 SRAboutView::SRAboutView()
 {
-    m_wcsAbout  = "<html><body><b><font size=\"+0\">SwordReader</font></b> v";
+    m_wcsAbout  = "<html><body><b><font size=\"+4\">SwordReader</font></b> v";
     m_wcsAbout += SR_VERSION_STRING;
     m_wcsAbout += "<br>";
     m_wcsAbout += "Built on: ";

Modified: trunk/src/SwordReader_GUI/SRMainFrame.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRMainFrame.cpp	2009-02-01 19:28:44 UTC (rev 207)
+++ trunk/src/SwordReader_GUI/SRMainFrame.cpp	2009-02-01 22:59:23 UTC (rev 208)
@@ -279,7 +279,6 @@
             ::SendMessage (m_hWnd, WM_CLOSE, 0, 0);
             break;
         case MENU_ABOUT:
-            //::MessageBox(0, L"Sword reader program for Pocket PC ver. 1.0.1\n\nsee: http://www.crosswire.org/sword/swordreader/\n\nGUI by Johan Gorter, 2004\nNow being maintained by B. Drake, Robin Randall and David Trotz\nProverbs 16:3", L"About", MB_OK);
             m_tabViews->ManualChangeCurrentTab(SR_TAB_ABOUT);
             break;
         case MENU_SHUTDOWN:

Modified: trunk/src/SwordReader_GUI/SRTextView.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRTextView.cpp	2009-02-01 19:28:44 UTC (rev 207)
+++ trunk/src/SwordReader_GUI/SRTextView.cpp	2009-02-01 22:59:23 UTC (rev 208)
@@ -631,7 +631,7 @@
     INT     lfHeight    = -1*((int)(0x000000FF & ((dwlFontState & 0x000000FF00000000) >> 32)));
     HGDIOBJ oldFont     = 0;
     // Compute the font cache index...
-    DWORD   dwFontCacheIndex = (DWORD) (0x000000FF & ((dwlFontState & (BTEXT_HTML_B_BEG | BTEXT_HTML_I_BEG | BTEXT_HTML_A_BEG)) | ((dwlFontState & 0x000000FF00000000) >> 24)) );
+    DWORD   dwFontCacheIndex = (DWORD) ((dwlFontState & (BTEXT_HTML_B_BEG | BTEXT_HTML_I_BEG | BTEXT_HTML_A_BEG)) | ((dwlFontState & 0x000000FF00000000) >> 24));
     
     if(!m_fPreRendered && 
         m_lfCurFont.lfWeight    == lfWeight && 
@@ -733,6 +733,7 @@
     if(!m_fPreRendered){
         PreRenderBuff(hdc);
     }
+    
 
     for(unsigned int line = 0; line <= m_BTLines.m_dwLastLine; line++){
         SRTextWord *pTWord = &m_BTLines.m_lpLines[line];


