AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@97 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1998-06-14 20:53:26 +00:00
parent 89a51b2e38
commit e5fb7191bb
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/msw/todo.txt
View File

@ -42,17 +42,17 @@ Update manual.
wxTabCtrl DONE wxTabCtrl DONE
wxNotebook wxNotebook
wxWave DONE wxWave DONE
wxJoystick wxJoystick DONE
wxStatusBar95 and wxFrame status bar functions wxStatusBar95 and wxFrame status bar functions
wxListBox changes (for ownerdraw functionality) wxListBox changes (for ownerdraw functionality)
wxThread DONE (except for topic overview) wxThread DONE (except for topic overview)
wxHelpController classes DONE (except for Unix ones)
wxString wxString
wxTString wxTString
Drag and drop (change API if required, e.g. const). Drag and drop (change API if required, e.g. const).
wxCheckListBox wxCheckListBox
wxBaseArray, other arrays wxBaseArray, other arrays
(wxOwnerDrawn) (wxOwnerDrawn)
Various events
Document the include file for each class Document the include file for each class
Write tutorial. Write tutorial.

3
include/wx/event.h
View File

@ -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_POWER,
wxEVT_CREATE, wxEVT_CREATE,
wxEVT_DESTROY, wxEVT_DESTROY,
wxEVT_SHOW,
wxEVT_MOUSE_CAPTURE_CHANGED, wxEVT_MOUSE_CAPTURE_CHANGED,
wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95) wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
wxEVT_QUERY_NEW_PALETTE, wxEVT_QUERY_NEW_PALETTE,

8
include/wx/help.h
View File

@ -9,5 +9,13 @@
#include "wx/generic/helpxlp.h" #include "wx/generic/helpxlp.h"
#endif #endif
#ifdef __WINDOWS__
#define wxHelpController wxWinHelpController
#elif defined(__GTK__)
#define wxHelpController wxHTMLHelpController
#else
#define wxHelpController wxXLPHelpController
#endif
#endif #endif
// __HELPH_BASE__ // __HELPH_BASE__

3
include/wx/helpbase.h
View File

@ -32,7 +32,8 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
// Must call this to set the filename and server name. // Must call this to set the filename and server name.
// server is only required when implementing TCP/IP-based // server is only required when implementing TCP/IP-based
// help controllers. // 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 // If file is "", reloads file given in Initialize
virtual bool LoadFile(const wxString& file = "") = 0; virtual bool LoadFile(const wxString& file = "") = 0;

8
src/msw/helpwin.cpp
View File

@ -131,7 +131,13 @@ bool wxWinHelpController::KeywordSearch(const wxString& k)
// Can't close the help window explicitly in WinHelp // Can't close the help window explicitly in WinHelp
bool wxWinHelpController::Quit(void) 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