Put wxContextHelp into cshelp.h/cpp, added wxContextHelpButton

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

distrib/msw/tmake/filelist.txt

@@ -111,6 +111,7 @@ cmdline.cpp	C	B
 cmndata.cpp	C
 clipcmn.cpp	C
 config.cpp	C	B
+cshelp.cpp	C
 ctrlcmn.cpp	C
 ctrlsub.cpp	C
 datetime.cpp	C	B
@@ -623,6 +624,7 @@ gsocket.h	W	B
 hash.h	W	B
 help.h	W
 helpbase.h	W
+cshelp.h	W
 helphtml.h	W
 helpchm.h	W
 helpwin.h	W

include/wx/cshelp.h

@@ -0,0 +1,74 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        cshelp.h
+// Purpose:     Context-sensitive help classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     08/09/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CSHELPH__
+#define _WX_CSHELPH__
+
+#ifdef __GNUG__
+#pragma interface "cshelp.h"
+#endif
+
+#include "wx/defs.h"
+
+#if wxUSE_HELP
+
+#include "wx/bmpbuttn.h"
+
+/*
+ * wxContextHelp
+ * Invokes context-sensitive help. When the user
+ * clicks on a window, a wxEVT_HELP event will be sent to that
+ * window for the application to display help for.
+ */
+
+class WXDLLEXPORT wxContextHelp: public wxObject
+{
+    DECLARE_DYNAMIC_CLASS(wxContextHelp)
+public:
+    wxContextHelp(wxWindow* win = NULL, bool beginHelp = TRUE);
+    ~wxContextHelp();
+
+    bool BeginContextHelp(wxWindow* win);
+    bool EndContextHelp();
+
+    bool EventLoop();
+    bool DispatchEvent(wxWindow* win, const wxPoint& pt);
+
+    void SetStatus(bool status) { m_status = status; }
+
+protected:
+
+    bool    m_inHelp;
+    bool    m_status; // TRUE if the user left-clicked
+};
+
+/*
+ * wxContextHelpButton
+ * You can add this to your dialogs (especially on non-Windows platforms)
+ * to put the application into context help mode.
+ */
+
+class WXDLLEXPORT wxContextHelpButton: public wxBitmapButton
+{
+public:
+    wxContextHelpButton(wxWindow* parent, wxWindowID id = wxID_CONTEXT_HELP,
+        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(20, -1),
+        long style = wxBU_AUTODRAW);
+
+    void OnContextHelp(wxCommandEvent& event);
+
+    DECLARE_CLASS(wxContextHelpButton)
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // wxUSE_HELP
+#endif
+// _WX_CSHELPH__

include/wx/defs.h

@@ -1310,6 +1310,7 @@ enum wxStretch
 #define wxID_MORE               5109
 #define wxID_SETUP              5110
 #define wxID_RESET              5111
+#define wxID_CONTEXT_HELP       5112
 
 // IDs used by generic file dialog (11 consecutive starting from this value)
 #define wxID_FILEDLGG           5900

include/wx/event.h

@@ -293,6 +293,7 @@ enum
 
     /* Help events */
     wxEVT_HELP = wxEVT_FIRST + 1050,
+    wxEVT_DETAILED_HELP,
 
     wxEVT_USER_FIRST = wxEVT_FIRST + 2000
 };
@@ -1404,7 +1405,7 @@ public:
 };
 
 /*
- wxEVT_HELP
+ wxEVT_HELP, wxEVT_DETAILED_HELP
  Sent when the user clicks on a window in context-help mode.
  The cursor position is in screen coordinates.
  */
@@ -1417,10 +1418,21 @@ public:
   wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxPoint(0, 0))
       { m_eventType = type; m_id = id; m_pos = pt; }
 
+  // Position of event
   const wxPoint& GetPosition() const { return m_pos; }
   void SetPosition(const wxPoint& pos) { m_pos = pos; }
 
+  // Optional link to further help
+  const wxString& GetLink() const { return m_link; }
+  void SetLink(const wxString& link) { m_link = link; }
+
+  // Optional target to display help in. E.g. a window specification
+  const wxString& GetTarget() const { return m_target; }
+  void SetTarget(const wxString& target) { m_target = target; }
+
   wxPoint   m_pos;
+  wxString  m_target;
+  wxString  m_link;
 };
 
 #endif // wxUSE_GUI
@@ -1849,6 +1861,12 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 #define EVT_HELP_RANGE(id1, id2, func) \
  { wxEVT_HELP, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxHelpEventFunction) & func, (wxObject *) NULL },
 
+#define EVT_DETAILED_HELP(id, func) \
+ { wxEVT_DETAILED_HELP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxHelpEventFunction) & func, (wxObject *) NULL },
+
+#define EVT_DETAILED_HELP_RANGE(id1, id2, func) \
+ { wxEVT_DETAILED_HELP, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxHelpEventFunction) & func, (wxObject *) NULL },
+
 // ----------------------------------------------------------------------------
 // Global data
 // ----------------------------------------------------------------------------

include/wx/helpbase.h

@@ -76,34 +76,6 @@ public:
     virtual void OnQuit(void) {};
 };
 
-/*
- * wxContextHelp
- * Invokes context-sensitive help. When the user
- * clicks on a window, a wxEVT_HELP event will be sent to that
- * window for the application to display help for.
- */
-
-class WXDLLEXPORT wxContextHelp: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxContextHelp)
-public:
-    wxContextHelp(wxWindow* win = NULL, bool beginHelp = TRUE);
-    ~wxContextHelp();
-
-    bool BeginContextHelp(wxWindow* win);
-    bool EndContextHelp();
-
-    bool EventLoop();
-    bool DispatchEvent(wxWindow* win, const wxPoint& pt);
-
-    void SetStatus(bool status) { m_status = status; }
-
-protected:
-
-    bool    m_inHelp;
-    bool    m_status; // TRUE if the user left-clicked
-};
-
 #endif // wxUSE_HELP
 #endif
 // _WX_HELPBASEH__

include/wx/msw/wx.rc

@@ -155,3 +155,6 @@ plot_enl_bmp            BITMAP  "wx/msw/plot_enl.bmp"
 plot_shr_bmp            BITMAP  "wx/msw/plot_shr.bmp"
 plot_zin_bmp            BITMAP  "wx/msw/plot_zin.bmp"
 plot_zot_bmp            BITMAP  "wx/msw/plot_zot.bmp"
+
+// For wxContextHelpButton
+csquery_bmp             BITMAP "wx/msw/csquery.bmp"

samples/help/demo.cpp

@@ -32,6 +32,7 @@
 
 #   include "wx/image.h"
 #   include "wx/help.h"
+#   include "wx/cshelp.h"
 
 #if wxUSE_TOOLTIPS
 #   include "wx/tooltip.h"

src/common/cshelp.cpp

@@ -0,0 +1,234 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        cshelp.cpp
+// Purpose:     Context sensitive help class implementation
+// Author:      Julian Smart
+// Modified by:
+// Created:     08/09/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "cshelp.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/defs.h"
+#endif
+
+#include "wx/app.h"
+
+#if wxUSE_HELP
+
+#include "wx/cshelp.h"
+
+/*
+ * Invokes context-sensitive help
+ */
+
+// This class exists in order to eat events until the left mouse
+// button is pressed
+class wxContextHelpEvtHandler: public wxEvtHandler
+{
+public:
+    wxContextHelpEvtHandler(wxContextHelp* contextHelp)
+    {
+        m_contextHelp = contextHelp;
+    }
+
+    virtual bool ProcessEvent(wxEvent& event);
+
+//// Data
+    wxContextHelp* m_contextHelp;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxContextHelp, wxObject)
+
+wxContextHelp::wxContextHelp(wxWindow* win, bool beginHelp)
+{
+    m_inHelp = FALSE;
+
+    if (beginHelp)
+        BeginContextHelp(win);
+}
+
+wxContextHelp::~wxContextHelp()
+{
+    if (m_inHelp)
+        EndContextHelp();
+}
+
+// Begin 'context help mode'
+bool wxContextHelp::BeginContextHelp(wxWindow* win)
+{
+    if (!win)
+        win = wxTheApp->GetTopWindow();
+    if (!win)
+        return FALSE;
+
+    wxCursor cursor(wxCURSOR_QUESTION_ARROW);
+    wxCursor oldCursor = win->GetCursor();
+    win->SetCursor(cursor);
+
+#ifdef __WXMSW__
+    //    wxSetCursor(cursor);
+#endif
+
+    win->PushEventHandler(new wxContextHelpEvtHandler(this));
+
+    win->CaptureMouse();
+
+    EventLoop();
+
+    win->ReleaseMouse();
+
+    win->PopEventHandler(TRUE);
+
+    win->SetCursor(oldCursor);
+
+    if (m_status)
+    {
+        wxPoint pt;
+        wxWindow* winAtPtr = wxFindWindowAtPointer(pt);
+        if (winAtPtr)
+            DispatchEvent(winAtPtr, pt);
+    }
+
+    return TRUE;
+}
+
+bool wxContextHelp::EndContextHelp()
+{
+    m_inHelp = FALSE;
+
+    return TRUE;
+}
+
+bool wxContextHelp::EventLoop()
+{
+    m_inHelp = TRUE;
+    while ( m_inHelp )
+    {
+        if (wxTheApp->Pending())
+        {
+            wxTheApp->Dispatch();
+        }
+        else
+        {
+            wxTheApp->ProcessIdle();
+        }
+    }
+    return TRUE;
+}
+
+bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
+{
+    switch (event.GetEventType())
+    {
+        case wxEVT_LEFT_DOWN:
+        {
+	  //wxMouseEvent& mouseEvent = (wxMouseEvent&) event;
+            m_contextHelp->SetStatus(TRUE);
+            m_contextHelp->EndContextHelp();
+            return TRUE;
+            break;
+        }
+        case wxEVT_CHAR:
+        case wxEVT_KEY_DOWN:
+        case wxEVT_ACTIVATE:
+        case wxEVT_MOUSE_CAPTURE_CHANGED:
+        {
+            m_contextHelp->SetStatus(FALSE);
+            m_contextHelp->EndContextHelp();
+            return TRUE;
+            break;
+        }
+        case wxEVT_PAINT:
+        case wxEVT_ERASE_BACKGROUND:
+        {
+            event.Skip();
+            return FALSE;
+            break;
+        }
+    }
+
+    return TRUE;
+}
+
+// Dispatch the help event to the relevant window
+bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
+{
+    wxWindow* subjectOfHelp = win;
+    bool eventProcessed = FALSE;
+    while (subjectOfHelp && !eventProcessed)
+    {
+        wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;
+        helpEvent.SetEventObject(this);
+        eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);
+        
+        // Go up the window hierarchy until the event is handled (or not).
+        // I.e. keep submitting ancestor windows until one is recognised
+        // by the app code that processes the ids and displays help.
+        subjectOfHelp = subjectOfHelp->GetParent();
+    }
+    return eventProcessed;
+}
+
+/*
+ * wxContextHelpButton
+ * You can add this to your dialogs (especially on non-Windows platforms)
+ * to put the application into context help mode.
+ */
+
+#if !defined(__WXMSW__)
+static char * csquery_xpm[] = {
+"12 11 2 1",
+" 	c None",
+".	c Black",
+"            ",
+"    ....    ",
+"   ..  ..   ",
+"   ..  ..   ",
+"      ..    ",
+"     ..     ",
+"     ..     ",
+"            ",
+"     ..     ",
+"     ..     ",
+"            "};
+#endif
+
+IMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton)
+
+BEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)
+    EVT_BUTTON(wxID_CONTEXT_HELP, wxContextHelpButton::OnContextHelp)
+END_EVENT_TABLE()
+
+wxContextHelpButton::wxContextHelpButton(wxWindow* parent, wxWindowID id,
+        const wxPoint& pos, const wxSize& size,
+        long style):
+   wxBitmapButton(parent, id, wxNullBitmap, pos, size, style)
+{
+#ifdef __WXMSW__
+    wxBitmap bitmap(wxT("csquery_bmp"), wxBITMAP_TYPE_BMP_RESOURCE);
+#else
+    wxBitmap bitmap(csquery_xpm);
+#endif
+
+    SetBitmapLabel(bitmap);
+}
+
+void wxContextHelpButton::OnContextHelp(wxCommandEvent& event)
+{
+    wxContextHelp contextHelp;
+}
+
+#endif // wxUSE_HELP

src/common/helpbase.cpp

@@ -25,162 +25,9 @@
 #endif
 
 #include "wx/helpbase.h"
-#include "wx/app.h"
 
 #if wxUSE_HELP
 
 IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
 
-/*
- * Invokes context-sensitive help
- */
-
-// This class exists in order to eat events until the left mouse
-// button is pressed
-class wxContextHelpEvtHandler: public wxEvtHandler
-{
-public:
-    wxContextHelpEvtHandler(wxContextHelp* contextHelp)
-    {
-        m_contextHelp = contextHelp;
-    }
-
-    virtual bool ProcessEvent(wxEvent& event);
-
-//// Data
-    wxContextHelp* m_contextHelp;
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxContextHelp, wxObject)
-
-wxContextHelp::wxContextHelp(wxWindow* win, bool beginHelp)
-{
-    m_inHelp = FALSE;
-
-    if (beginHelp)
-        BeginContextHelp(win);
-}
-
-wxContextHelp::~wxContextHelp()
-{
-    if (m_inHelp)
-        EndContextHelp();
-}
-
-// Begin 'context help mode'
-bool wxContextHelp::BeginContextHelp(wxWindow* win)
-{
-    if (!win)
-        win = wxTheApp->GetTopWindow();
-    if (!win)
-        return FALSE;
-
-    wxCursor cursor(wxCURSOR_QUESTION_ARROW);
-    wxCursor oldCursor = win->GetCursor();
-    win->SetCursor(cursor);
-
-#ifdef __WXMSW__
-    //    wxSetCursor(cursor);
-#endif
-
-    win->PushEventHandler(new wxContextHelpEvtHandler(this));
-
-    win->CaptureMouse();
-
-    EventLoop();
-
-    win->ReleaseMouse();
-
-    win->PopEventHandler(TRUE);
-
-    win->SetCursor(oldCursor);
-
-    if (m_status)
-    {
-        wxPoint pt;
-        wxWindow* winAtPtr = wxFindWindowAtPointer(pt);
-        if (winAtPtr)
-            DispatchEvent(winAtPtr, pt);
-    }
-
-    return TRUE;
-}
-
-bool wxContextHelp::EndContextHelp()
-{
-    m_inHelp = FALSE;
-
-    return TRUE;
-}
-
-bool wxContextHelp::EventLoop()
-{
-    m_inHelp = TRUE;
-    while ( m_inHelp )
-    {
-        if (wxTheApp->Pending())
-        {
-            wxTheApp->Dispatch();
-        }
-        else
-        {
-            wxTheApp->ProcessIdle();
-        }
-    }
-    return TRUE;
-}
-
-bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
-{
-    switch (event.GetEventType())
-    {
-        case wxEVT_LEFT_DOWN:
-        {
-	  //wxMouseEvent& mouseEvent = (wxMouseEvent&) event;
-            m_contextHelp->SetStatus(TRUE);
-            m_contextHelp->EndContextHelp();
-            return TRUE;
-            break;
-        }
-        case wxEVT_CHAR:
-        case wxEVT_KEY_DOWN:
-        case wxEVT_ACTIVATE:
-        case wxEVT_MOUSE_CAPTURE_CHANGED:
-        {
-            m_contextHelp->SetStatus(FALSE);
-            m_contextHelp->EndContextHelp();
-            return TRUE;
-            break;
-        }
-        case wxEVT_PAINT:
-        case wxEVT_ERASE_BACKGROUND:
-        {
-            event.Skip();
-            return FALSE;
-            break;
-        }
-    }
-
-    return TRUE;
-}
-
-// Dispatch the help event to the relevant window
-bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
-{
-    wxWindow* subjectOfHelp = win;
-    bool eventProcessed = FALSE;
-    while (subjectOfHelp && !eventProcessed)
-    {
-        wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;
-        helpEvent.SetEventObject(this);
-        eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);
-        
-        // Go up the window hierarchy until the event is handled (or not).
-        // I.e. keep submitting ancestor windows until one is recognised
-        // by the app code that processes the ids and displays help.
-        subjectOfHelp = subjectOfHelp->GetParent();
-    }
-    return eventProcessed;
-}
-
 #endif // wxUSE_HELP

src/gtk/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -48,6 +48,7 @@ ALL_SOURCES = \
 		common/cmdline.cpp \
 		common/cmndata.cpp \
 		common/config.cpp \
+		common/cshelp.cpp \
 		common/ctrlcmn.cpp \
 		common/ctrlsub.cpp \
 		common/datetime.cpp \
@@ -256,6 +257,7 @@ ALL_HEADERS = \
 		confbase.h \
 		config.h \
 		control.h \
+		cshelp.h \
 		ctrlsub.h \
 		cursor.h \
 		dataobj.h \
@@ -564,6 +566,7 @@ COMMONOBJS = \
 		cmdline.o \
 		cmndata.o \
 		config.o \
+		cshelp.o \
 		ctrlcmn.o \
 		ctrlsub.o \
 		datetime.o \
@@ -668,6 +671,7 @@ COMMONDEPS = \
 		cmdline.d \
 		cmndata.d \
 		config.d \
+		cshelp.d \
 		ctrlcmn.d \
 		ctrlsub.d \
 		datetime.d \

src/gtk1/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -48,6 +48,7 @@ ALL_SOURCES = \
 		common/cmdline.cpp \
 		common/cmndata.cpp \
 		common/config.cpp \
+		common/cshelp.cpp \
 		common/ctrlcmn.cpp \
 		common/ctrlsub.cpp \
 		common/datetime.cpp \
@@ -256,6 +257,7 @@ ALL_HEADERS = \
 		confbase.h \
 		config.h \
 		control.h \
+		cshelp.h \
 		ctrlsub.h \
 		cursor.h \
 		dataobj.h \
@@ -564,6 +566,7 @@ COMMONOBJS = \
 		cmdline.o \
 		cmndata.o \
 		config.o \
+		cshelp.o \
 		ctrlcmn.o \
 		ctrlsub.o \
 		datetime.o \
@@ -668,6 +671,7 @@ COMMONDEPS = \
 		cmdline.d \
 		cmndata.d \
 		config.d \
+		cshelp.d \
 		ctrlcmn.d \
 		ctrlsub.d \
 		datetime.d \

src/motif/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -51,6 +51,7 @@ ALL_SOURCES = \
 		common/cmdline.cpp \
 		common/cmndata.cpp \
 		common/config.cpp \
+		common/cshelp.cpp \
 		common/ctrlcmn.cpp \
 		common/ctrlsub.cpp \
 		common/datetime.cpp \
@@ -253,6 +254,7 @@ ALL_HEADERS = \
 		confbase.h \
 		config.h \
 		control.h \
+		cshelp.h \
 		ctrlsub.h \
 		cursor.h \
 		dataobj.h \
@@ -561,6 +563,7 @@ COMMONOBJS = \
 		cmdline.o \
 		cmndata.o \
 		config.o \
+		cshelp.o \
 		ctrlcmn.o \
 		ctrlsub.o \
 		datetime.o \
@@ -665,6 +668,7 @@ COMMONDEPS = \
 		cmdline.d \
 		cmndata.d \
 		config.d \
+		cshelp.d \
 		ctrlcmn.d \
 		ctrlsub.d \
 		datetime.d \

src/msw/makefile.b32

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -99,7 +99,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\splash.obj \
 		$(MSWDIR)\splitter.obj \
 		$(MSWDIR)\statusbr.obj \
-		$(MSWDIR)\tabg.obj \
 		$(MSWDIR)\tbarsmpl.obj \
 		$(MSWDIR)\textdlgg.obj \
 		$(MSWDIR)\tipdlg.obj \
@@ -126,6 +125,7 @@ COMMONOBJS = \
 		$(MSWDIR)\cmdline.obj \
 		$(MSWDIR)\cmndata.obj \
 		$(MSWDIR)\config.obj \
+		$(MSWDIR)\cshelp.obj \
 		$(MSWDIR)\ctrlcmn.obj \
 		$(MSWDIR)\ctrlsub.obj \
 		$(MSWDIR)\datetime.obj \
@@ -614,6 +614,8 @@ $(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
 $(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
+$(MSWDIR)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF)
+
 $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
 $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
@@ -854,8 +856,6 @@ $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
 $(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
 
-$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
-
 $(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
 
 $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)

src/msw/makefile.bcc

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -115,6 +115,7 @@ COMMONOBJS = \
 		$(MSWDIR)\cmdline.obj \
 		$(MSWDIR)\cmndata.obj \
 		$(MSWDIR)\config.obj \
+		$(MSWDIR)\cshelp.obj \
 		$(MSWDIR)\ctrlcmn.obj \
 		$(MSWDIR)\ctrlsub.obj \
 		$(MSWDIR)\datetime.obj \
@@ -492,6 +493,8 @@ $(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
 $(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
+$(MSWDIR)\cshelp.obj: $(COMMDIR)\cshelp.$(SRCSUFF)
+
 $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
 $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)

src/msw/makefile.dos

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -100,6 +100,7 @@ COMMONOBJS1 = \
 		$(COMMDIR)\cmdline.obj \
 		$(COMMDIR)\cmndata.obj \
 		$(COMMDIR)\config.obj \
+		$(COMMDIR)\cshelp.obj \
 		$(COMMDIR)\ctrlcmn.obj \
 		$(COMMDIR)\ctrlsub.obj \
 		$(COMMDIR)\datetime.obj \
@@ -783,6 +784,11 @@ $(COMMDIR)/config.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/cshelp.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/ctrlcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

src/msw/makefile.g95

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -90,7 +90,6 @@ GENERICOBJS = \
 		$(GENDIR)/splash.$(OBJSUFF) \
 		$(GENDIR)/splitter.$(OBJSUFF) \
 		$(GENDIR)/statusbr.$(OBJSUFF) \
-		$(GENDIR)/tabg.$(OBJSUFF) \
 		$(GENDIR)/tbarsmpl.$(OBJSUFF) \
 		$(GENDIR)/textdlgg.$(OBJSUFF) \
 		$(GENDIR)/tipdlg.$(OBJSUFF) \
@@ -106,6 +105,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/cmdline.$(OBJSUFF) \
 		$(COMMDIR)/cmndata.$(OBJSUFF) \
 		$(COMMDIR)/config.$(OBJSUFF) \
+		$(COMMDIR)/cshelp.$(OBJSUFF) \
 		$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
 		$(COMMDIR)/ctrlsub.$(OBJSUFF) \
 		$(COMMDIR)/datetime.$(OBJSUFF) \

src/msw/makefile.sc

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -47,10 +47,10 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\splash.obj \
 		$(GENDIR)\splitter.obj \
 		$(GENDIR)\statusbr.obj \
-		$(GENDIR)\tabg.obj \
 		$(GENDIR)\tbarsmpl.obj \
 		$(GENDIR)\textdlgg.obj \
 		$(GENDIR)\tipdlg.obj \
+		$(GENDIR)\treectlg.obj \
 		$(GENDIR)\treelay.obj \
 		$(GENDIR)\wizard.obj
 
@@ -62,6 +62,7 @@ COMMONOBJS = \
 		$(COMMDIR)\cmdline.obj \
 		$(COMMDIR)\cmndata.obj \
 		$(COMMDIR)\config.obj \
+		$(COMMDIR)\cshelp.obj \
 		$(COMMDIR)\ctrlcmn.obj \
 		$(COMMDIR)\ctrlsub.obj \
 		$(COMMDIR)\datetime.obj \

src/msw/makefile.vc

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -27,6 +27,9 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif
 
+# This one overrides the others, to be consistent with the settings in setup.h
+MINIMAL_WXWINDOWS_SETUP=0
+
 PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
@@ -101,10 +104,10 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\splash.obj \
 		..\generic\$D\splitter.obj \
 		..\generic\$D\statusbr.obj \
-		..\generic\$D\tabg.obj \
 		..\generic\$D\tbarsmpl.obj \
 		..\generic\$D\textdlgg.obj \
 		..\generic\$D\tipdlg.obj \
+		..\generic\$D\treectlg.obj \
 		..\generic\$D\treelay.obj \
 		..\generic\$D\wizard.obj
 
@@ -127,7 +130,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
 		..\generic\$D\printps.obj \
 		..\generic\$D\prntdlgg.obj \
 		..\generic\$D\statline.obj \
-		..\generic\$D\treectlg.obj
+		..\generic\$D\tabg.obj
 
 COMMONOBJS = \
 		..\common\$D\y_tab.obj \
@@ -137,6 +140,7 @@ COMMONOBJS = \
 		..\common\$D\cmdline.obj \
 		..\common\$D\cmndata.obj \
 		..\common\$D\config.obj \
+		..\common\$D\cshelp.obj \
 		..\common\$D\ctrlcmn.obj \
 		..\common\$D\ctrlsub.obj \
 		..\common\$D\datetime.obj \

src/msw/makefile.wat

@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -62,10 +62,10 @@ GENERICOBJS= busyinfo.obj &
 	splash.obj &
 	splitter.obj &
 	statusbr.obj &
-	tabg.obj &
 	tbarsmpl.obj &
 	textdlgg.obj &
 	tipdlg.obj &
+	treectlg.obj &
 	treelay.obj &
 	wizard.obj
 
@@ -88,7 +88,7 @@ NONESSENTIALOBJS= caret.obj &
 	printps.obj &
 	prntdlgg.obj &
 	statline.obj &
-	treectlg.obj
+	tabg.obj
 
 COMMONOBJS = &
 	y_tab.obj &
@@ -98,6 +98,7 @@ COMMONOBJS = &
 	cmdline.obj &
 	cmndata.obj &
 	config.obj &
+	cshelp.obj &
 	ctrlcmn.obj &
 	ctrlsub.obj &
 	datetime.obj &
@@ -664,6 +665,9 @@ cmndata.obj:     $(COMMDIR)\cmndata.cpp
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+cshelp.obj:     $(COMMDIR)\cshelp.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1032,9 +1036,6 @@ splitter.obj:     $(GENDIR)\splitter.cpp
 statusbr.obj:     $(GENDIR)\statusbr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tabg.obj:     $(GENDIR)\tabg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1044,6 +1045,9 @@ textdlgg.obj:     $(GENDIR)\textdlgg.cpp
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+treectlg.obj:     $(GENDIR)\treectlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 treelay.obj:     $(GENDIR)\treelay.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

src/os2/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:57, 2000/08/04
+# This file was automatically generated by tmake at 11:57, 2000/09/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -45,6 +45,7 @@ ALL_SOURCES = \
 		common/cmdline.cpp \
 		common/cmndata.cpp \
 		common/config.cpp \
+		common/cshelp.cpp \
 		common/ctrlcmn.cpp \
 		common/ctrlsub.cpp \
 		common/datetime.cpp \
@@ -263,6 +264,7 @@ ALL_HEADERS = \
 		confbase.h \
 		config.h \
 		control.h \
+		cshelp.h \
 		ctrlsub.h \
 		cursor.h \
 		dataobj.h \
@@ -579,6 +581,7 @@ COMMONOBJS = \
 		cmdline.o \
 		cmndata.o \
 		config.o \
+		cshelp.o \
 		ctrlcmn.o \
 		ctrlsub.o \
 		datetime.o \
@@ -683,6 +686,7 @@ COMMONDEPS = \
 		cmdline.d \
 		cmndata.d \
 		config.d \
+		cshelp.d \
 		ctrlcmn.d \
 		ctrlsub.d \
 		datetime.d \

src/wxvc.dsp

@@ -109,6 +109,10 @@ SOURCE=.\common\config.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\cshelp.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File

src/wxvc_dll.dsp

@@ -116,6 +116,10 @@ SOURCE=.\common\config.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\cshelp.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File