Code changes 1.83

PaulSquires · Nov 10, 2018 · cf49581 · cf49581
1 parent 1521d03
commit cf49581
Show file tree

Hide file tree

Showing 90 changed files with 263 additions and 195 deletions.
diff --git a/Help/WinFBE/Visual Designer/Colors.html b/Help/WinFBE/Visual Designer/Colors.html
diff --git a/Help/WinFBE/Visual Designer/Controls/Button.html b/Help/WinFBE/Visual Designer/Controls/Button.html
diff --git a/Help/WinFBE/Visual Designer/Controls/CheckBox.html b/Help/WinFBE/Visual Designer/Controls/CheckBox.html
diff --git a/Help/WinFBE/Visual Designer/Controls/ComboBox.html b/Help/WinFBE/Visual Designer/Controls/ComboBox.html
diff --git a/Help/WinFBE/Visual Designer/Controls/Form.html b/Help/WinFBE/Visual Designer/Controls/Form.html
diff --git a/Help/WinFBE/Visual Designer/Controls/Frame.html b/Help/WinFBE/Visual Designer/Controls/Frame.html
diff --git a/Help/WinFBE/Visual Designer/Controls/Label.html b/Help/WinFBE/Visual Designer/Controls/Label.html
diff --git a/Help/WinFBE/Visual Designer/Controls/ListBox.html b/Help/WinFBE/Visual Designer/Controls/ListBox.html
diff --git a/Help/WinFBE/Visual Designer/Controls/OptionButton.html b/Help/WinFBE/Visual Designer/Controls/OptionButton.html
diff --git a/Help/WinFBE/Visual Designer/Controls/TextBox.html b/Help/WinFBE/Visual Designer/Controls/TextBox.html
diff --git a/Help/WinFBE/Visual Designer/Event Handlers.html b/Help/WinFBE/Visual Designer/Event Handlers.html
diff --git a/Help/WinFBE/Visual Designer/Fonts.html b/Help/WinFBE/Visual Designer/Fonts.html
diff --git a/Help/WinFBE/Visual Designer/Overview.html b/Help/WinFBE/Visual Designer/Overview.html
diff --git a/Help/WinFBE/Visual Designer/Resource Files.html b/Help/WinFBE/Visual Designer/Resource Files.html
diff --git a/Help/WinFBE/Visual Designer/Resource Files.md b/Help/WinFBE/Visual Designer/Resource Files.md
@@ -23,59 +23,59 @@ The link to the manifest file is important because Windows uses it to describe t
 The following is a generic manifest file that you can use:
 
 ```
-    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-       <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+  
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <assemblyIdentity version="1.0.0.0"
+    processorArchitecture="*"
+    name="ApplicationName"
+    type="win32"/>
+  <description>Optional description of your application</description>
+  
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+    <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
     
-          <assemblyIdentity version="1.0.0.0"
-             processorArchitecture="*"
-             name="ApplicationName"
-             type="win32"/>
-          <description>Optional description of your application</description>
+  <!-- Compatibility section -->
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--The ID below indicates application support for Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!--The ID below indicates application support for Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--This Id value indicates the application supports Windows 8 functionality-->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!--This Id value indicates the application supports Windows 8.1 functionality-->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!--This Id value indicates the application supports Windows 10 functionality-->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+  
+  <!-- Trustinfo section -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
     
-          <asmv3:application>
-             <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-                <dpiAware>true</dpiAware>
-             </asmv3:windowsSettings>
-          </asmv3:application>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        processorArchitecture="*"
+        publicKeyToken="6595b64144ccf1df"
+        language="*" />
+    </dependentAssembly>
+  </dependency>
     
-          <!-- Compatibility section -->
-          <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-             <application>
-                <!--The ID below indicates application support for Windows Vista -->
-                <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-                <!--The ID below indicates application support for Windows 7 -->
-                <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-                <!--This Id value indicates the application supports Windows 8 functionality-->
-                <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-                <!--This Id value indicates the application supports Windows 8.1 functionality-->
-                <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-                <!--This Id value indicates the application supports Windows 10 functionality-->
-                <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-             </application>
-           </compatibility>
-    
-          <!-- Trustinfo section -->
-          <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-             <security>
-                <requestedPrivileges>
-                   <requestedExecutionLevel
-                      level="asInvoker"
-                      uiAccess="false"/>
-                   </requestedPrivileges>
-             </security>
-          </trustInfo>
-    
-          <dependency>
-             <dependentAssembly>
-                <assemblyIdentity
-                   type="win32"
-                   name="Microsoft.Windows.Common-Controls"
-                   version="6.0.0.0"
-                   processorArchitecture="*"
-                   publicKeyToken="6595b64144ccf1df"
-                   language="*" />
-             </dependentAssembly>
-          </dependency>
-    
-       </assembly>
+</assembly>
 ```
diff --git a/Help/WinFBX/CCDAudio Class.html b/Help/WinFBX/CCDAudio Class.html
diff --git a/Help/WinFBX/COM/CAxHost Class.html b/Help/WinFBX/COM/CAxHost Class.html
diff --git a/Help/WinFBX/COM/CCDOMessage Class.html b/Help/WinFBX/COM/CCDOMessage Class.html
diff --git a/Help/WinFBX/COM/CDSAudio Class.html b/Help/WinFBX/COM/CDSAudio Class.html
diff --git a/Help/WinFBX/COM/CDicObj Class.html b/Help/WinFBX/COM/CDicObj Class.html
diff --git a/Help/WinFBX/COM/CDispInvoke Class.html b/Help/WinFBX/COM/CDispInvoke Class.html
diff --git a/Help/WinFBX/COM/COM Procedures.html b/Help/WinFBX/COM/COM Procedures.html
diff --git a/Help/WinFBX/COM/CQueue Class.html b/Help/WinFBX/COM/CQueue Class.html
diff --git a/Help/WinFBX/COM/CSafeArray Class.html b/Help/WinFBX/COM/CSafeArray Class.html
diff --git a/Help/WinFBX/COM/CStack Class.html b/Help/WinFBX/COM/CStack Class.html
diff --git a/Help/WinFBX/COM/CVAR Class.html b/Help/WinFBX/COM/CVAR Class.html
diff --git a/Help/WinFBX/COM/CWebCtx Class.html b/Help/WinFBX/COM/CWebCtx Class.html
diff --git a/Help/WinFBX/COM/CWinHttpRequest Class.html b/Help/WinFBX/COM/CWinHttpRequest Class.html
diff --git a/Help/WinFBX/COM/CWmiDisp Class.html b/Help/WinFBX/COM/CWmiDisp Class.html
diff --git a/Help/WinFBX/Databases/ADO Classes/ADO.html b/Help/WinFBX/Databases/ADO Classes/ADO.html
diff --git a/Help/WinFBX/Databases/ADO Classes/CADOCommand Class.html b/Help/WinFBX/Databases/ADO Classes/CADOCommand Class.html
diff --git a/Help/WinFBX/Databases/ADO Classes/CADOConnection Class.html b/Help/WinFBX/Databases/ADO Classes/CADOConnection Class.html
diff --git a/Help/WinFBX/Databases/ADO Classes/CADOFields Class.html b/Help/WinFBX/Databases/ADO Classes/CADOFields Class.html
diff --git a/Help/WinFBX/Databases/ADO Classes/CADORecod Class.html b/Help/WinFBX/Databases/ADO Classes/CADORecod Class.html
diff --git a/Help/WinFBX/Databases/ADO Classes/CADORecordset Class.html b/Help/WinFBX/Databases/ADO Classes/CADORecordset Class.html
diff --git a/Help/WinFBX/Databases/ADO Classes/CADOStream Class.html b/Help/WinFBX/Databases/ADO Classes/CADOStream Class.html
diff --git a/Help/WinFBX/Databases/CSQLite Class.html b/Help/WinFBX/Databases/CSQLite Class.html
diff --git a/Help/WinFBX/Databases/ODBC Classes/CODBC Class.html b/Help/WinFBX/Databases/ODBC Classes/CODBC Class.html
diff --git a/Help/WinFBX/Databases/ODBC Classes/CODBCStmt Class.html b/Help/WinFBX/Databases/ODBC Classes/CODBCStmt Class.html
diff --git a/Help/WinFBX/DateTime/CFileTime Class.html b/Help/WinFBX/DateTime/CFileTime Class.html
diff --git a/Help/WinFBX/DateTime/COleDateTime Class.html b/Help/WinFBX/DateTime/COleDateTime Class.html
diff --git a/Help/WinFBX/DateTime/CTime64 Class.html b/Help/WinFBX/DateTime/CTime64 Class.html
diff --git a/Help/WinFBX/DateTime/DateTime Procedures.html b/Help/WinFBX/DateTime/DateTime Procedures.html
diff --git a/Help/WinFBX/File Management/CFileStream Class.html b/Help/WinFBX/File Management/CFileStream Class.html
diff --git a/Help/WinFBX/File Management/CFileSys Class.html b/Help/WinFBX/File Management/CFileSys Class.html
diff --git a/Help/WinFBX/File Management/CFindFile Class.html b/Help/WinFBX/File Management/CFindFile Class.html
diff --git a/Help/WinFBX/File Management/CIniFile Class.html b/Help/WinFBX/File Management/CIniFile Class.html
diff --git a/Help/WinFBX/File Management/CMemMapFile Class.html b/Help/WinFBX/File Management/CMemMapFile Class.html
diff --git a/Help/WinFBX/File Management/CMemStream Class.html b/Help/WinFBX/File Management/CMemStream Class.html
diff --git a/Help/WinFBX/File Management/CTextStream Class.html b/Help/WinFBX/File Management/CTextStream Class.html
diff --git a/Help/WinFBX/File Management/File Procedures.html b/Help/WinFBX/File Management/File Procedures.html
diff --git a/Help/WinFBX/File Management/Shortcut Classes.html b/Help/WinFBX/File Management/Shortcut Classes.html
diff --git a/Help/WinFBX/Graphics/CGraphCtx Class.html b/Help/WinFBX/Graphics/CGraphCtx Class.html
diff --git a/Help/WinFBX/Graphics/CImageCtx Class.html b/Help/WinFBX/Graphics/CImageCtx Class.html
diff --git a/Help/WinFBX/Graphics/CMemBmp Class.html b/Help/WinFBX/Graphics/CMemBmp Class.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGdiPlus.html b/Help/WinFBX/Graphics/GdiPlus/CGdiPlus.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpBrush Classes.html b/Help/WinFBX/Graphics/GdiPlus/CGpBrush Classes.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpCustomeLineCap Classes.html b/Help/WinFBX/Graphics/GdiPlus/CGpCustomeLineCap Classes.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpFont Classes.html b/Help/WinFBX/Graphics/GdiPlus/CGpFont Classes.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpGraphics Classes.html b/Help/WinFBX/Graphics/GdiPlus/CGpGraphics Classes.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpImage Classes.html b/Help/WinFBX/Graphics/GdiPlus/CGpImage Classes.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpMatrix Class.html b/Help/WinFBX/Graphics/GdiPlus/CGpMatrix Class.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpPen Class.html b/Help/WinFBX/Graphics/GdiPlus/CGpPen Class.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpRegion Class.html b/Help/WinFBX/Graphics/GdiPlus/CGpRegion Class.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/CGpStringFormat Class.html b/Help/WinFBX/Graphics/GdiPlus/CGpStringFormat Class.html
diff --git a/Help/WinFBX/Graphics/GdiPlus/GdiPlus Procedures.html b/Help/WinFBX/Graphics/GdiPlus/GdiPlus Procedures.html
diff --git a/Help/WinFBX/Graphics/OpenGL Procedures.html b/Help/WinFBX/Graphics/OpenGL Procedures.html
diff --git a/Help/WinFBX/Numeric datatypes/CCUR Class.html b/Help/WinFBX/Numeric datatypes/CCUR Class.html
diff --git a/Help/WinFBX/Numeric datatypes/CComplex Class.html b/Help/WinFBX/Numeric datatypes/CComplex Class.html
diff --git a/Help/WinFBX/Numeric datatypes/CDEC Class.html b/Help/WinFBX/Numeric datatypes/CDEC Class.html
diff --git a/Help/WinFBX/Numeric datatypes/CInt96 Class.html b/Help/WinFBX/Numeric datatypes/CInt96 Class.html
diff --git a/Help/WinFBX/Numeric datatypes/Complex Numbers Procedures.html b/Help/WinFBX/Numeric datatypes/Complex Numbers Procedures.html
diff --git a/Help/WinFBX/Printing/CPrint Class.html b/Help/WinFBX/Printing/CPrint Class.html
diff --git a/Help/WinFBX/String Management/CBSTR Class.html b/Help/WinFBX/String Management/CBSTR Class.html
diff --git a/Help/WinFBX/String Management/CRegExp Class.html b/Help/WinFBX/String Management/CRegExp Class.html
diff --git a/Help/WinFBX/String Management/CWSTR Class.html b/Help/WinFBX/String Management/CWSTR Class.html
diff --git a/Help/WinFBX/String Management/String Procedures.html b/Help/WinFBX/String Management/String Procedures.html
diff --git a/Help/WinFBX/Windows GUI/CMaskedEdit Class.html b/Help/WinFBX/Windows GUI/CMaskedEdit Class.html
diff --git a/Help/WinFBX/Windows GUI/CWindow Class.html b/Help/WinFBX/Windows GUI/CWindow Class.html
diff --git a/Help/WinFBX/Windows GUI/CXpButton Class.html b/Help/WinFBX/Windows GUI/CXpButton Class.html
diff --git a/Help/WinFBX/Windows GUI/Menu Procedures.html b/Help/WinFBX/Windows GUI/Menu Procedures.html
diff --git a/Help/WinFBX/Windows Procedures.html b/Help/WinFBX/Windows Procedures.html
diff --git a/WinFBE.wfbe b/WinFBE.wfbe
diff --git a/WinFBE32.exe b/WinFBE32.exe
diff --git a/WinFBE64.exe b/WinFBE64.exe
diff --git a/changes.txt b/changes.txt
@@ -1,9 +1,15 @@
+Version 1.8.3 (November 10, 2018)
+- Added: Back, Forward, Print, Find buttons to the Help Viewer display dialog.
+- Added: MaximizeBox, MinimizeBox to the Help Viewer display dialog.
+- Changed: The generated HTML help file code no longer imposes a fixed page width of 728 pixels.
+
 Version 1.8.2 (November 8, 2018)
 - Added: CMaskedEdit control (from the WinFBX Library framework). 
 - Added: ComboBox control.
 - Added: Code editor Calltips for the Frame control.
+- Added: New Help system for WinFBE and WinFBX.
 - Fixed: CheckBox and OptionButton now correctly test for BN_CLICKED notification.
-- Fixed: "Custom Color" label in the PropertyList color picker would not disply properly in WinFBE64.
+- Fixed: "Custom Color" label in the PropertyList color picker would not display properly in WinFBE64.
 - Fixed: Pressing TAB key in the Replace popup form (Ctrl+R) will now move keyboard input focus between the Find and Replace textboxes.
 
 Version 1.8.1 (October 7, 2018)

diff --git a/src/WinFBE.bas b/src/WinFBE.bas
@@ -41,7 +41,7 @@ Using Afx
 
 #Define APPNAME       WStr("WinFBE - FreeBASIC Editor")
 #Define APPNAMESHORT  WStr("WinFBE")
-#Define APPVERSION    WStr("1.8.2") 
+#Define APPVERSION    WStr("1.8.3") 
 
 #ifdef __FB_64BIT__
    #Define APPBITS WStr(" (64-bit)")

diff --git a/src/frmHelpViewer.inc b/src/frmHelpViewer.inc
@@ -22,11 +22,15 @@ Function frmHelpViewer_PositionWindows( ByVal HWnd As HWnd ) As LRESULT
    GetClientRect(HWnd, @rc)
 
    dim as hwnd hTabCtrl = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_TABCONTROL)
-   dim as hwnd hTree(1), hWebBrowser(1)
+   dim as hwnd hTree(1), hWebBrowser(1), hBtn(3)
    hTree(0) = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_TVWINFBE)
    hTree(1) = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_TVWINFBX)
    hWebBrowser(0) = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_WEBBROWSER_WINFBE )
    hWebBrowser(1) = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_WEBBROWSER_WINFBX )
+   hBtn(0) = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_BACK ) 
+   hBtn(1) = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_FORWARD ) 
+   hBtn(2) = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_PRINT ) 
+   hBtn(3) = GetDlgItem(HWnd, IDC_FRMHELPVIEWER_FIND )
 
    dim as long nCurSel = TabCtrl_GetCurSel(hTabCtrl) 
    select case nCurSel
@@ -40,13 +44,23 @@ Function frmHelpViewer_PositionWindows( ByVal HWnd As HWnd ) As LRESULT
       ShowWindow( hWebBrowser(0), SW_HIDE)
    end select
 
+   dim as long nSpace     = AfxScaleY(4)
+   dim as long nBtnHeight = AfxScaleY(28)
+   dim as long nBtnWidth  = AfxScaleY(74)
    dim as long nTabHeight = AfxScaleY(24)
    dim as long nTreeWidth = AfxScaleX(200)
    dim as long nTreeHeight = rc.Bottom-rc.top-nTabHeight-AfxScaleY(30)
 
    SetWindowPos( hTabCtrl, 0, 0, 0, rc.Right-rc.Left, nTabHeight, SWP_SHOWWINDOW Or SWP_NOZORDER)
-   SetWindowPos( hTree(nCurSel), 0, 0, nTabHeight+AfxScaleY(30), nTreeWidth, nTreeHeight, SWP_SHOWWINDOW Or SWP_NOZORDER)
-   SetWindowPos( hWebBrowser(nCurSel), 0, nTreeWidth, nTabHeight, rc.Right-rc.Left-nTreeWidth, rc.Bottom-rc.top-nTabHeight, SWP_SHOWWINDOW Or SWP_NOZORDER)
+   SetWindowPos( hTree(nCurSel), 0, 0, AfxScaleY(70), nTreeWidth, nTreeHeight, SWP_SHOWWINDOW Or SWP_NOZORDER)
+
+   dim nLeft as long = 0
+   for i as long = 0 to 3
+      SetWindowPos( hBtn(i), 0, nTreeWidth + nLeft, nTabHeight + (nSpace * 2), nBtnWidth, nBtnHeight, SWP_SHOWWINDOW Or SWP_NOZORDER)
+      nLeft = nLeft + nBtnWidth + nSpace               
+   next
+   SetWindowPos( hWebBrowser(nCurSel), 0, nTreeWidth, AfxScaleY(70), _
+                  rc.Right-rc.Left-nTreeWidth, rc.Bottom-rc.top-nTabHeight-nBtnHeight, SWP_SHOWWINDOW Or SWP_NOZORDER)
 
    Function = 0
 End Function
@@ -57,6 +71,34 @@ End Function
 ' ========================================================================================
 Function frmHelpViewer_OnCommand(ByVal HWnd As HWnd, ByVal id As Long, ByVal hwndCtl As HWnd, ByVal codeNotify As UINT) As LRESULT
 
+   DIM pwb AS CWebCtx PTR 
+
+   select case TabCtrl_GetCurSel( GetDlgItem(HWnd, IDC_FRMHELPVIEWER_TABCONTROL) ) 
+      case -1:  exit function   
+      case  0:  pwb = CAST(CWebCtx PTR, GetProp(hwnd, "CWEBCTXPTR_WINFBE"))
+      case  1:  pwb = CAST(CWebCtx PTR, GetProp(hwnd, "CWEBCTXPTR_WINFBX")) 
+   end select
+   if pwb = 0 then exit function
+
+   Select Case id
+      Case IDC_FRMHELPVIEWER_BACK
+         If codeNotify = BN_CLICKED Then
+            pwb->GoBack
+         End If
+      Case IDC_FRMHELPVIEWER_FORWARD
+         If codeNotify = BN_CLICKED Then
+            pwb->GoForward
+         End If
+      Case IDC_FRMHELPVIEWER_PRINT
+         If codeNotify = BN_CLICKED Then
+            pwb->PrintPreview
+         End If
+      Case IDC_FRMHELPVIEWER_FIND
+         If codeNotify = BN_CLICKED Then
+            pwb->Find
+         End If
+   End Select
+
    Function = 0
 End Function
 
@@ -237,7 +279,7 @@ Function frmHelpViewer_Show( ByVal hWndParent As HWnd, _
    ' If function list already exists then toggle its visibility
    ' unless nCmdShow is explicitly set to show it.
    If IsWindow(HWND_FRMHELPVIEWER) Then
-      If nCmdShow <> SW_SHOW Then nCmdShow = Iif(IsWindowVisible(HWND_FRMHELPVIEWER), SW_HIDE, SW_SHOW)
+      If nCmdShow <> SW_SHOW Then nCmdShow = Iif(IsWindowVisible(HWND_FRMHELPVIEWER), SW_HIDE, SW_SHOWNORMAL)
       dim as hwnd hTabCtrl = GetDlgItem(HWND_FRMHELPVIEWER, IDC_FRMHELPVIEWER_TABCONTROL)
       select case gHelpViewerIndex 
          case IDM_HELPWINFBE: TabCtrl_SetCurSel(hTabCtrl, 0) 
@@ -260,8 +302,8 @@ Function frmHelpViewer_Show( ByVal hWndParent As HWnd, _
    Dim nWidth  As Long = (rcWork.Right - rcWork.Left) * .80
 
    HWND_FRMHELPVIEWER = _
-   pWindow->Create( hWndParent, "Help Viewer", @frmHelpViewer_WndProc, 0, 0, nWidth, nHeight, _
-        WS_POPUP Or WS_CAPTION Or WS_SYSMENU Or WS_THICKFRAME, _
+   pWindow->Create( 0, "Help Viewer", @frmHelpViewer_WndProc, 0, 0, nWidth, nHeight, _
+        WS_POPUP Or WS_CAPTION Or WS_SYSMENU Or WS_MAXIMIZEBOX or WS_MINIMIZEBOX or WS_THICKFRAME, _
         WS_EX_LEFT Or WS_EX_LTRREADING Or WS_EX_RIGHTSCROLLBAR)
    pWindow->Center(pWindow->hWindow, hWndParent)
    pWindow->brush = GetSysColorBrush(COLOR_WINDOW)
@@ -331,6 +373,23 @@ Function frmHelpViewer_Show( ByVal hWndParent As HWnd, _
    LoadHelpTreeview(hTree, AfxGetExePath & "\Help\WinFBE\", null)
 
    
+   ' Add the naviagation and print buttons
+   pWindow->AddControl("BUTTON", , IDC_FRMHELPVIEWER_BACK, "Back", 0, 0, 0, 0, _
+        WS_CHILD Or WS_VISIBLE Or WS_TABSTOP Or BS_TEXT Or BS_PUSHBUTTON Or BS_NOTIFY Or BS_CENTER Or BS_VCENTER, _
+        WS_EX_LEFT Or WS_EX_LTRREADING)
+   
+   pWindow->AddControl("BUTTON", , IDC_FRMHELPVIEWER_FORWARD, "Forward", 0, 0, 0, 0, _
+        WS_CHILD Or WS_VISIBLE Or WS_TABSTOP Or BS_TEXT Or BS_PUSHBUTTON Or BS_NOTIFY Or BS_CENTER Or BS_VCENTER, _
+        WS_EX_LEFT Or WS_EX_LTRREADING)
+
+   pWindow->AddControl("BUTTON", , IDC_FRMHELPVIEWER_PRINT, "Print", 0, 0, 0, 0, _
+        WS_CHILD Or WS_VISIBLE Or WS_TABSTOP Or BS_TEXT Or BS_PUSHBUTTON Or BS_NOTIFY Or BS_CENTER Or BS_VCENTER, _
+        WS_EX_LEFT Or WS_EX_LTRREADING)
+
+   pWindow->AddControl("BUTTON", , IDC_FRMHELPVIEWER_FIND, "Find", 0, 0, 0, 0, _
+        WS_CHILD Or WS_VISIBLE Or WS_TABSTOP Or BS_TEXT Or BS_PUSHBUTTON Or BS_NOTIFY Or BS_CENTER Or BS_VCENTER, _
+        WS_EX_LEFT Or WS_EX_LTRREADING)
+
    ' Add a WebBrowser controls
    DIM pwb1 AS CWebCtx PTR = NEW CWebCtx(pWindow, IDC_FRMHELPVIEWER_WEBBROWSER_WINFBE, 0, 0, pWindow->ClientWidth, pWindow->ClientHeight)
    SetProp(pWindow->hWindow, "CWEBCTXPTR_WINFBE", CAST(HANDLE, pwb1))

diff --git a/src/frmMain.inc b/src/frmMain.inc
@@ -1895,6 +1895,7 @@ End Function
 ' ========================================================================================
 Function frmMain_OnActivateApp(ByVal HWnd As HWnd, ByVal fActivate As BOOLEAN, ByVal dwThreadId As DWORD) As LRESULT
 
+
    Dim pDoc As clsDocument Ptr
 
    ' If the application is losing focus then validate any currently editing peroperty
@@ -1974,7 +1975,6 @@ Function frmMain_OnActivateApp(ByVal HWnd As HWnd, ByVal fActivate As BOOLEAN, B
             End If
          Next
       NEXT
-      frmMain_SetFocusToCurrentCodeWindow()
    End If
 
    Function = 0

diff --git a/src/modDeclares.bi b/src/modDeclares.bi
@@ -258,7 +258,10 @@
 #Define IDC_FRMHELPVIEWER_TABCONTROL                1002
 #Define IDC_FRMHELPVIEWER_TVWINFBE                  1003
 #Define IDC_FRMHELPVIEWER_TVWINFBX                  1004
-
+#Define IDC_FRMHELPVIEWER_BACK                      1005 
+#Define IDC_FRMHELPVIEWER_FORWARD                   1006 
+#Define IDC_FRMHELPVIEWER_PRINT                     1007 
+#Define IDC_FRMHELPVIEWER_FIND                      1008 
 
 #Define IsFalse(e) ( Not CBool(e) )
 #Define IsTrue(e) ( CBool(e) )