From fb6261e9ba8b162347135a9174afbc81244b10cc Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 8 Sep 2000 10:49:39 +0000 Subject: [PATCH] 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 | 2 + include/wx/cshelp.h | 74 +++++++++++ include/wx/defs.h | 1 + include/wx/event.h | 20 ++- include/wx/helpbase.h | 28 ---- include/wx/msw/csquery.bmp | Bin 0 -> 206 bytes include/wx/msw/wx.rc | 3 + samples/help/demo.cpp | 1 + src/common/cshelp.cpp | 234 +++++++++++++++++++++++++++++++++ src/common/helpbase.cpp | 153 --------------------- src/gtk/files.lst | 6 +- src/gtk1/files.lst | 6 +- src/motif/files.lst | 6 +- src/msw/makefile.b32 | 8 +- src/msw/makefile.bcc | 5 +- src/msw/makefile.dos | 8 +- src/msw/makefile.g95 | 4 +- src/msw/makefile.sc | 5 +- src/msw/makefile.vc | 10 +- src/msw/makefile.wat | 16 ++- src/os2/files.lst | 6 +- src/wxvc.dsp | 4 + src/wxvc_dll.dsp | 4 + 23 files changed, 399 insertions(+), 205 deletions(-) create mode 100644 include/wx/cshelp.h create mode 100644 include/wx/msw/csquery.bmp create mode 100644 src/common/cshelp.cpp diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index d21c284737..4c41322c02 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/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 diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h new file mode 100644 index 0000000000..e4b241f492 --- /dev/null +++ b/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__ diff --git a/include/wx/defs.h b/include/wx/defs.h index 3e690ec0b5..e466657e89 100644 --- a/include/wx/defs.h +++ b/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 diff --git a/include/wx/event.h b/include/wx/event.h index 6a2a9f46c7..17aad6eace 100644 --- a/include/wx/event.h +++ b/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 // ---------------------------------------------------------------------------- diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h index d6d7ff83b5..c35b3b0cb1 100644 --- a/include/wx/helpbase.h +++ b/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__ diff --git a/include/wx/msw/csquery.bmp b/include/wx/msw/csquery.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7a635552680f00d50acf7ca2e7a3efbf03f1e31f GIT binary patch literal 206 zcmYj|u?>JQ3NO63A`|X_9tB40VV1)%H%~a`z z9mCn^oroflDkX$Ut6D4Si`G-Ec?UeVDAq%0PG+O}Vx0fIaf_c5#-RPy@8jPGr>8KF literal 0 HcmV?d00001 diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 2787d3b645..ef8c9f7bc5 100644 --- a/include/wx/msw/wx.rc +++ b/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" diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index 2dc35fa01c..9d58eb3167 100644 --- a/samples/help/demo.cpp +++ b/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" diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp new file mode 100644 index 0000000000..fe75524bb8 --- /dev/null +++ b/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 diff --git a/src/common/helpbase.cpp b/src/common/helpbase.cpp index a99317ac72..94d808ac5b 100644 --- a/src/common/helpbase.cpp +++ b/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 diff --git a/src/gtk/files.lst b/src/gtk/files.lst index f09570863b..4571d4c618 100644 --- a/src/gtk/files.lst +++ b/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 \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index f09570863b..4571d4c618 100644 --- a/src/gtk1/files.lst +++ b/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 \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 31fe9594dc..23f375dabf 100644 --- a/src/motif/files.lst +++ b/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 \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 7e6c0405ea..ebb69f856c 100644 --- a/src/msw/makefile.b32 +++ b/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) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index e3929fa7f9..b1e381a800 100644 --- a/src/msw/makefile.bcc +++ b/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) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 8e5a133d13..dd40f35126 100644 --- a/src/msw/makefile.dos +++ b/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) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 13b3a489eb..49fd14dcaf 100644 --- a/src/msw/makefile.g95 +++ b/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) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index b98c93941b..eb3568847c 100644 --- a/src/msw/makefile.sc +++ b/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 \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 066d62dc8f..79be1c8059 100644 --- a/src/msw/makefile.vc +++ b/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 \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 10b8d512e7..4adabe4f0b 100644 --- a/src/msw/makefile.wat +++ b/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) $< diff --git a/src/os2/files.lst b/src/os2/files.lst index a0017bd78b..2ff83d101d 100644 --- a/src/os2/files.lst +++ b/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 \ diff --git a/src/wxvc.dsp b/src/wxvc.dsp index b35b9110cd..9dfb5f6c98 100644 --- a/src/wxvc.dsp +++ b/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 diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp index eab6437c6e..96387f564d 100644 --- a/src/wxvc_dll.dsp +++ b/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 -- 2.45.2