Added #define wxHelpController to help.h; added wxWinHelpController::Quit code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@97 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/msw/todo.txt b/docs/msw/todo.txt
index cd04d91f92c312e79db189b3d5094ba403772cd4..96c04211692794b8954854371e9f67795d61ec82 100644 (file)
--- a/docs/msw/todo.txt
+++ b/docs/msw/todo.txt
@@ -42,17 +42,17 @@ Update manual.
     wxTabCtrl           DONE
     wxNotebook
     wxWave              DONE
     wxTabCtrl           DONE
     wxNotebook
     wxWave              DONE

-    wxJoystick
+    wxJoystick          DONE

     wxStatusBar95 and wxFrame status bar functions
     wxListBox changes (for ownerdraw functionality)
     wxThread            DONE (except for topic overview)
     wxStatusBar95 and wxFrame status bar functions
     wxListBox changes (for ownerdraw functionality)
     wxThread            DONE (except for topic overview)

+    wxHelpController classes DONE (except for Unix ones)

     wxString
     wxTString
     Drag and drop (change API if required, e.g. const).
     wxCheckListBox
     wxBaseArray, other arrays
     (wxOwnerDrawn)
     wxString
     wxTString
     Drag and drop (change API if required, e.g. const).
     wxCheckListBox
     wxBaseArray, other arrays
     (wxOwnerDrawn)

-    Various events

     Document the include file for each class
 
 Write tutorial.
     Document the include file for each class
 
 Write tutorial.

diff --git a/include/wx/event.h b/include/wx/event.h
index 1860e4a4ec6460af8f7ce7019d15a2192b78a5df..483a2ad797b2b04f91cf37e997bd4aee90ec4565 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -900,11 +900,10 @@ class WXDLLEXPORT wxSysColourChangedEvent: public wxEvent
      { m_eventType = wxEVT_SYS_COLOUR_CHANGED; }
 };
 
      { m_eventType = wxEVT_SYS_COLOUR_CHANGED; }
 };
 

-/* TODO, apart from events for individual controls...
+/* TODO

  wxEVT_POWER,
  wxEVT_CREATE,
  wxEVT_DESTROY,
  wxEVT_POWER,
  wxEVT_CREATE,
  wxEVT_DESTROY,

- wxEVT_SHOW,

  wxEVT_MOUSE_CAPTURE_CHANGED,
  wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
  wxEVT_QUERY_NEW_PALETTE,
  wxEVT_MOUSE_CAPTURE_CHANGED,
  wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
  wxEVT_QUERY_NEW_PALETTE,

diff --git a/include/wx/help.h b/include/wx/help.h
index 9622355ff6aa3a2aa4d007e428cf535b4d6e2903..eb1575cd8488b1205d89a9bcd97a4f58301b10ec 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -9,5 +9,13 @@
 #include "wx/generic/helpxlp.h"
 #endif
 
 #include "wx/generic/helpxlp.h"
 #endif
 

+#ifdef __WINDOWS__
+#define wxHelpController wxWinHelpController
+#elif defined(__GTK__)
+#define wxHelpController wxHTMLHelpController
+#else
+#define wxHelpController wxXLPHelpController
+#endif
+

 #endif
     // __HELPH_BASE__
 #endif
     // __HELPH_BASE__

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 24557948d1654a1a8b751ab23cf2277b479feb48..1e7752f5c5e5b20267edf29ba098389b11320876 100644 (file)
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -32,7 +32,8 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
   // Must call this to set the filename and server name.
   // server is only required when implementing TCP/IP-based
   // help controllers.
   // Must call this to set the filename and server name.
   // server is only required when implementing TCP/IP-based
   // help controllers.

-  virtual bool Initialize(const wxString& file, int server = -1) = 0;
+  virtual bool Initialize(const wxString& file, int server) { return FALSE; };
+  virtual bool Initialize(const wxString& file) = 0;

 
   // If file is "", reloads file given  in Initialize
   virtual bool LoadFile(const wxString& file = "") = 0;
 
   // If file is "", reloads file given  in Initialize
   virtual bool LoadFile(const wxString& file = "") = 0;

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index 07d27cdf58e4a4657b0d47061c8fc0f66adbcc43..dab0ab53960ee64c02b1ce3b349167729725059a 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -131,7 +131,13 @@ bool wxWinHelpController::KeywordSearch(const wxString& k)
 // Can't close the help window explicitly in WinHelp
 bool wxWinHelpController::Quit(void)
 {
 // Can't close the help window explicitly in WinHelp
 bool wxWinHelpController::Quit(void)
 {

-  return TRUE;
+  if (wxTheApp->GetTopWindow())
+  {
+    WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), 0, HELP_QUIT, 0L);
+    return TRUE;
+  }
+  else
+    return FALSE;

 }
 
 // Don't get notified of WinHelp quitting
 }
 
 // Don't get notified of WinHelp quitting