From 88a9f974b8d98b194174270c575cc6cb9b2b5bd3 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 9 Oct 2001 22:50:33 +0000 Subject: [PATCH] Moved the [Set|Get]Client[Data|Object] and such out of wxWindowBase and into a mixin class. Mixed it with wxEvtHandler. Regenerated files lists and makefiles. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 2 + include/wx/clntdata.h | 93 ++++++++++++++++++++++++++++++++++ include/wx/event.h | 5 +- include/wx/window.h | 67 ------------------------ src/common/clntdata.cpp | 87 +++++++++++++++++++++++++++++++ src/common/wincmn.cpp | 53 ------------------- src/gtk/files.lst | 7 ++- src/gtk1/files.lst | 7 ++- src/mac/carbon/files.lst | 6 ++- src/mac/files.lst | 6 ++- src/motif/files.lst | 7 ++- src/msw/files.lst | 36 ++++++++++++- src/msw/makebase.vc | 2 +- src/msw/makefile.b32 | 15 +++--- src/msw/makefile.bcc | 5 +- src/msw/makefile.dos | 8 ++- src/msw/makefile.g95 | 3 +- src/msw/makefile.sc | 3 +- src/msw/makefile.vc | 3 +- src/msw/makefile.wat | 6 ++- src/os2/files.lst | 7 ++- src/univ/files.lst | 3 +- 22 files changed, 287 insertions(+), 144 deletions(-) create mode 100644 include/wx/clntdata.h create mode 100644 src/common/clntdata.cpp diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index c3e927efc6..118d207a96 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -114,6 +114,7 @@ wizard.cpp Generic appcmn.cpp Common Base choiccmn.cpp Common clipcmn.cpp Common +clntdata.cpp Common cmdline.cpp Common Base cmdproc.cpp Common cmndata.cpp Common @@ -703,6 +704,7 @@ chkconf.h WXH Base choicdlg.h WXH choice.h WXH clipbrd.h WXH +clntdata.h WXH cmdline.h WXH Base cmdproc.h WXH cmndata.h WXH diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h new file mode 100644 index 0000000000..e91f2391b2 --- /dev/null +++ b/include/wx/clntdata.h @@ -0,0 +1,93 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/clntdata.h +// Purpose: A mixin class for holding a wxClientData or void pointer +// Author: Robin Dunn +// Modified by: +// Created: 9-Oct-2001 +// RCS-ID: $Id$ +// Copyright: (c) wxWindows team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_CLNTDATAH__ +#define _WX_CLNTDATAH__ + +#ifdef __GNUG__ + #pragma interface "event.h" +#endif + +#include "wx/defs.h" + +// ---------------------------------------------------------------------------- + +// what kind of client data do we have? +enum wxClientDataType +{ + wxClientData_None, // we don't know yet because we don't have it at all + wxClientData_Object, // our client data is typed and we own it + wxClientData_Void // client data is untyped and we don't own it +}; + +class WXDLLEXPORT wxClientData +{ +public: + wxClientData() { } + virtual ~wxClientData() { } +}; + +class WXDLLEXPORT wxStringClientData : public wxClientData +{ +public: + wxStringClientData() { } + wxStringClientData( const wxString &data ) : m_data(data) { } + void SetData( const wxString &data ) { m_data = data; } + const wxString& GetData() const { return m_data; } + +private: + wxString m_data; +}; + + +class WXDLLEXPORT wxClientDataContainer +{ +public: + wxClientDataContainer(); + ~wxClientDataContainer(); + + // each window may have associated client data: either a pointer to + // wxClientData object in which case it is managed by the window (i.e. + // it will delete the data when it's destroyed) or an untyped pointer + // which won't be deleted by the window - but not both of them + void SetClientObject( wxClientData *data ) { DoSetClientObject(data); } + wxClientData *GetClientObject() const { return DoGetClientObject(); } + + void SetClientData( void *data ) { DoSetClientData(data); } + void *GetClientData() const { return DoGetClientData(); } + +protected: + // user data associated with the window: either an object which will be + // deleted by the window when it's deleted or some raw pointer which we do + // nothing with - only one type of data can be used with the given window + // (i.e. you cannot set the void data and then associate the window with + // wxClientData or vice versa) + union + { + wxClientData *m_clientObject; + void *m_clientData; + }; + + // client data accessors + virtual void DoSetClientObject( wxClientData *data ); + virtual wxClientData *DoGetClientObject() const; + + virtual void DoSetClientData( void *data ); + virtual void *DoGetClientData() const; + + // what kind of data do we have? + wxClientDataType m_clientDataType; + +}; + +// ---------------------------------------------------------------------------- +#endif + diff --git a/include/wx/event.h b/include/wx/event.h index 1763657844..aa9a3b1425 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -18,6 +18,7 @@ #include "wx/defs.h" #include "wx/object.h" +#include "wx/clntdata.h" #if wxUSE_GUI #include "wx/gdicmn.h" @@ -33,7 +34,6 @@ class WXDLLEXPORT wxList; #if wxUSE_GUI - class WXDLLEXPORT wxClientData; class WXDLLEXPORT wxDC; class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxWindow; @@ -1551,6 +1551,7 @@ protected: wxEVT_COMPARE_ITEM */ + // ============================================================================ // event handler and related classes // ============================================================================ @@ -1650,7 +1651,7 @@ struct WXDLLEXPORT wxEventTable // wxEvtHandler: the base class for all objects handling wxWindows events // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEvtHandler : public wxObject +class WXDLLEXPORT wxEvtHandler : public wxObject, public wxClientDataContainer { public: wxEvtHandler(); diff --git a/include/wx/window.h b/include/wx/window.h index 9f43aa71c9..4be6c62c95 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -49,7 +49,6 @@ // ---------------------------------------------------------------------------- class WXDLLEXPORT wxCaret; -class WXDLLEXPORT wxClientData; class WXDLLEXPORT wxControl; class WXDLLEXPORT wxCursor; class WXDLLEXPORT wxDC; @@ -74,39 +73,6 @@ WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class WXDLLEXPORT_DATA(extern wxWindowList) wxTopLevelWindows; -// ---------------------------------------------------------------------------- -// helper classes used by [SG]etClientObject/Data -// -// TODO move into a separate header? -// ---------------------------------------------------------------------------- - -// what kind of client data do we have? -enum wxClientDataType -{ - wxClientData_None, // we don't know yet because we don't have it at all - wxClientData_Object, // our client data is typed and we own it - wxClientData_Void // client data is untyped and we don't own it -}; - -class wxClientData -{ -public: - wxClientData() { } - virtual ~wxClientData() { } -}; - -class wxStringClientData : public wxClientData -{ -public: - wxStringClientData() { } - wxStringClientData( const wxString &data ) : m_data(data) { } - void SetData( const wxString &data ) { m_data = data; } - const wxString& GetData() const { return m_data; } - -private: - wxString m_data; -}; - // ---------------------------------------------------------------------------- // wxWindowBase is the base class for all GUI controls/widgets, this is the public // interface of this class. @@ -447,18 +413,6 @@ public: virtual wxValidator *GetValidator() { return m_windowValidator; } #endif // wxUSE_VALIDATORS - // client data - // ----------- - - // each window may have associated client data: either a pointer to - // wxClientData object in which case it is managed by the window (i.e. - // it will delete the data when it's destroyed) or an untyped pointer - // which won't be deleted by the window - but not both of them - void SetClientObject( wxClientData *data ) { DoSetClientObject(data); } - wxClientData *GetClientObject() const { return DoGetClientObject(); } - - void SetClientData( void *data ) { DoSetClientData(data); } - void *GetClientData() const { return DoGetClientData(); } // dialog oriented functions // ------------------------- @@ -842,17 +796,6 @@ protected: wxAcceleratorTable m_acceleratorTable; #endif // wxUSE_ACCEL - // user data associated with the window: either an object which will be - // deleted by the window when it's deleted or some raw pointer which we do - // nothing with - only one type of data can be used with the given window - // (i.e. you cannot set the void data and then associate the window with - // wxClientData or vice versa) - union - { - wxClientData *m_clientObject; - void *m_clientData; - }; - // the tooltip for this window (may be NULL) #if wxUSE_TOOLTIPS wxToolTip *m_tooltip; @@ -969,20 +912,10 @@ protected: virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) = 0; #endif // wxUSE_MENUS - // client data accessors - virtual void DoSetClientObject( wxClientData *data ); - virtual wxClientData *DoGetClientObject() const; - - virtual void DoSetClientData( void *data ); - virtual void *DoGetClientData() const; - // Makes an adjustment to the window position (for example, a frame that has // a toolbar that it manages itself). virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags); - // what kind of data do we have? - wxClientDataType m_clientDataType; - private: // contains the last id generated by NewControlId static int ms_lastControlId; diff --git a/src/common/clntdata.cpp b/src/common/clntdata.cpp new file mode 100644 index 0000000000..782f518465 --- /dev/null +++ b/src/common/clntdata.cpp @@ -0,0 +1,87 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: common/clntdata.cpp +// Purpose: A mixin class for holding a wxClientData or void pointer +// Author: Robin Dunn +// Modified by: +// Created: 9-Oct-2001 +// RCS-ID: $Id$ +// Copyright: (c) wxWindows team +// Licence: wxWindows license +///////////////////////////////////////////////////////////////////////////// + +#ifdef __GNUG__ + #pragma implementation "clntdata.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/clntdata.h" + + +// ---------------------------------------------------------------------------- + + +wxClientDataContainer::wxClientDataContainer() +{ + // no client data (yet) + m_clientData = NULL; + m_clientDataType = wxClientData_None; +} + +wxClientDataContainer::~wxClientDataContainer() +{ + // we only delete object data, not untyped + if ( m_clientDataType == wxClientData_Object ) + delete m_clientObject; +} + +void wxClientDataContainer::DoSetClientObject( wxClientData *data ) +{ + wxASSERT_MSG( m_clientDataType != wxClientData_Void, + wxT("can't have both object and void client data") ); + + if ( m_clientObject ) + delete m_clientObject; + + m_clientObject = data; + m_clientDataType = wxClientData_Object; +} + +wxClientData *wxClientDataContainer::DoGetClientObject() const +{ + // it's not an error to call GetClientObject() on a window which doesn't + // have client data at all - NULL will be returned + wxASSERT_MSG( m_clientDataType != wxClientData_Void, + wxT("this window doesn't have object client data") ); + + return m_clientObject; +} + +void wxClientDataContainer::DoSetClientData( void *data ) +{ + wxASSERT_MSG( m_clientDataType != wxClientData_Object, + wxT("can't have both object and void client data") ); + + m_clientData = data; + m_clientDataType = wxClientData_Void; +} + +void *wxClientDataContainer::DoGetClientData() const +{ + // it's not an error to call GetClientData() on a window which doesn't have + // client data at all - NULL will be returned + wxASSERT_MSG( m_clientDataType != wxClientData_Object, + wxT("this window doesn't have void client data") ); + + return m_clientData; +} + + +// ---------------------------------------------------------------------------- + + diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 92480ea046..07f22dfcb1 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -115,10 +115,6 @@ void wxWindowBase::InitBase() m_isShown = FALSE; m_isEnabled = TRUE; - // no client data (yet) - m_clientData = NULL; - m_clientDataType = wxClientData_None; - // the default event handler is just this window m_eventHandler = this; @@ -236,10 +232,6 @@ wxWindowBase::~wxWindowBase() delete m_windowValidator; #endif // wxUSE_VALIDATORS - // we only delete object data, not untyped - if ( m_clientDataType == wxClientData_Object ) - delete m_clientObject; - #if wxUSE_CONSTRAINTS // Have to delete constraints/sizer FIRST otherwise sizers may try to look // at deleted windows as they delete themselves. @@ -1471,51 +1463,6 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) return pt2; } -// ---------------------------------------------------------------------------- -// client data -// ---------------------------------------------------------------------------- - -void wxWindowBase::DoSetClientObject( wxClientData *data ) -{ - wxASSERT_MSG( m_clientDataType != wxClientData_Void, - wxT("can't have both object and void client data") ); - - if ( m_clientObject ) - delete m_clientObject; - - m_clientObject = data; - m_clientDataType = wxClientData_Object; -} - -wxClientData *wxWindowBase::DoGetClientObject() const -{ - // it's not an error to call GetClientObject() on a window which doesn't - // have client data at all - NULL will be returned - wxASSERT_MSG( m_clientDataType != wxClientData_Void, - wxT("this window doesn't have object client data") ); - - return m_clientObject; -} - -void wxWindowBase::DoSetClientData( void *data ) -{ - wxASSERT_MSG( m_clientDataType != wxClientData_Object, - wxT("can't have both object and void client data") ); - - m_clientData = data; - m_clientDataType = wxClientData_Void; -} - -void *wxWindowBase::DoGetClientData() const -{ - // it's not an error to call GetClientData() on a window which doesn't have - // client data at all - NULL will be returned - wxASSERT_MSG( m_clientDataType != wxClientData_Object, - wxT("this window doesn't have void client data") ); - - return m_clientData; -} - // ---------------------------------------------------------------------------- // event handlers // ---------------------------------------------------------------------------- diff --git a/src/gtk/files.lst b/src/gtk/files.lst index da34444790..8e3e25865a 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:18, 2001/10/06 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -51,6 +51,7 @@ ALL_SOURCES = \ common/appcmn.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ + common/clntdata.cpp \ common/cmdline.cpp \ common/cmdproc.cpp \ common/cmndata.cpp \ @@ -276,7 +277,9 @@ ALL_HEADERS = \ choicdlg.h \ choice.h \ clipbrd.h \ + clntdata.h \ cmdline.h \ + cmdproc.h \ cmndata.h \ colordlg.h \ colour.h \ @@ -575,6 +578,7 @@ ALL_HEADERS = \ generic/progdlgg.h \ generic/sashwin.h \ generic/scrolwin.h \ + generic/spinctlg.h \ generic/splash.h \ generic/splitter.h \ generic/statusbr.h \ @@ -609,6 +613,7 @@ COMMONOBJS = \ appcmn.o \ choiccmn.o \ clipcmn.o \ + clntdata.o \ cmdline.o \ cmdproc.o \ cmndata.o \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index da34444790..8e3e25865a 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:18, 2001/10/06 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -51,6 +51,7 @@ ALL_SOURCES = \ common/appcmn.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ + common/clntdata.cpp \ common/cmdline.cpp \ common/cmdproc.cpp \ common/cmndata.cpp \ @@ -276,7 +277,9 @@ ALL_HEADERS = \ choicdlg.h \ choice.h \ clipbrd.h \ + clntdata.h \ cmdline.h \ + cmdproc.h \ cmndata.h \ colordlg.h \ colour.h \ @@ -575,6 +578,7 @@ ALL_HEADERS = \ generic/progdlgg.h \ generic/sashwin.h \ generic/scrolwin.h \ + generic/spinctlg.h \ generic/splash.h \ generic/splitter.h \ generic/statusbr.h \ @@ -609,6 +613,7 @@ COMMONOBJS = \ appcmn.o \ choiccmn.o \ clipcmn.o \ + clntdata.o \ cmdline.o \ cmdproc.o \ cmndata.o \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index 811c0b992c..8f79b7bb09 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 23:22, 2001/10/04 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -49,6 +49,7 @@ ALL_SOURCES = \ common/appcmn.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ + common/clntdata.cpp \ common/cmdline.cpp \ common/cmdproc.cpp \ common/cmndata.cpp \ @@ -282,6 +283,7 @@ ALL_HEADERS = \ choicdlg.h \ choice.h \ clipbrd.h \ + clntdata.h \ cmdline.h \ cmdproc.h \ cmndata.h \ @@ -602,6 +604,7 @@ ALL_HEADERS = \ generic/progdlgg.h \ generic/sashwin.h \ generic/scrolwin.h \ + generic/spinctlg.h \ generic/splash.h \ generic/splitter.h \ generic/statusbr.h \ @@ -636,6 +639,7 @@ COMMONOBJS = \ appcmn.o \ choiccmn.o \ clipcmn.o \ + clntdata.o \ cmdline.o \ cmdproc.o \ cmndata.o \ diff --git a/src/mac/files.lst b/src/mac/files.lst index 811c0b992c..8f79b7bb09 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 23:22, 2001/10/04 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -49,6 +49,7 @@ ALL_SOURCES = \ common/appcmn.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ + common/clntdata.cpp \ common/cmdline.cpp \ common/cmdproc.cpp \ common/cmndata.cpp \ @@ -282,6 +283,7 @@ ALL_HEADERS = \ choicdlg.h \ choice.h \ clipbrd.h \ + clntdata.h \ cmdline.h \ cmdproc.h \ cmndata.h \ @@ -602,6 +604,7 @@ ALL_HEADERS = \ generic/progdlgg.h \ generic/sashwin.h \ generic/scrolwin.h \ + generic/spinctlg.h \ generic/splash.h \ generic/splitter.h \ generic/statusbr.h \ @@ -636,6 +639,7 @@ COMMONOBJS = \ appcmn.o \ choiccmn.o \ clipcmn.o \ + clntdata.o \ cmdline.o \ cmdproc.o \ cmndata.o \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 852bdb32ee..74b5aa6a2e 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 16:55, 2001/09/21 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -50,6 +50,7 @@ ALL_SOURCES = \ common/appcmn.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ + common/clntdata.cpp \ common/cmdline.cpp \ common/cmdproc.cpp \ common/cmndata.cpp \ @@ -266,7 +267,9 @@ ALL_HEADERS = \ choicdlg.h \ choice.h \ clipbrd.h \ + clntdata.h \ cmdline.h \ + cmdproc.h \ cmndata.h \ colordlg.h \ colour.h \ @@ -562,6 +565,7 @@ ALL_HEADERS = \ generic/progdlgg.h \ generic/sashwin.h \ generic/scrolwin.h \ + generic/spinctlg.h \ generic/splash.h \ generic/splitter.h \ generic/statusbr.h \ @@ -596,6 +600,7 @@ COMMONOBJS = \ appcmn.o \ choiccmn.o \ clipcmn.o \ + clntdata.o \ cmdline.o \ cmdproc.o \ cmndata.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index c4336e38cd..03a457ef5c 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 16:52, 2001/09/30 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -33,6 +33,7 @@ ALL_SOURCES = \ common/appcmn.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ + common/clntdata.cpp \ common/cmdline.cpp \ common/cmdproc.cpp \ common/cmndata.cpp \ @@ -293,7 +294,9 @@ ALL_HEADERS = \ choicdlg.h \ choice.h \ clipbrd.h \ + clntdata.h \ cmdline.h \ + cmdproc.h \ cmndata.h \ colordlg.h \ colour.h \ @@ -622,6 +625,7 @@ ALL_HEADERS = \ generic/progdlgg.h \ generic/sashwin.h \ generic/scrolwin.h \ + generic/spinctlg.h \ generic/splash.h \ generic/splitter.h \ generic/statusbr.h \ @@ -656,6 +660,7 @@ COMMONOBJS = \ appcmn.o \ choiccmn.o \ clipcmn.o \ + clntdata.o \ cmdline.o \ cmdproc.o \ cmndata.o \ @@ -906,9 +911,36 @@ GUIOBJS = \ window.o GUI_LOWLEVEL_OBJS = \ + app.o \ + bitmap.o \ + brush.o \ + caret.o \ + clipbrd.o \ + colour.o \ + cursor.o \ + data.o \ + dc.o \ + dcclient.o \ + dcmemory.o \ + dcprint.o \ + dcscreen.o \ + dib.o \ evtloop.o \ + font.o \ + fontenum.o \ + fontutil.o \ + gdiimage.o \ + gdiobj.o \ + icon.o \ imaglist.o \ - toplevel.o + main.o \ + palette.o \ + pen.o \ + region.o \ + settings.o \ + timer.o \ + toplevel.o \ + window.o HTMLOBJS = \ helpctrl.o \ diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc index 82c5cc6753..61ec7251ff 100644 --- a/src/msw/makebase.vc +++ b/src/msw/makebase.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASEVC.T! # File: makebase.vc diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 3fbea38d8f..68b0b006e0 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -117,6 +117,7 @@ COMMONOBJS = \ $(MSWDIR)\appcmn.obj \ $(MSWDIR)\choiccmn.obj \ $(MSWDIR)\clipcmn.obj \ + $(MSWDIR)\clntdata.obj \ $(MSWDIR)\cmdline.obj \ $(MSWDIR)\cmdproc.obj \ $(MSWDIR)\cmndata.obj \ @@ -636,6 +637,8 @@ $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) +$(MSWDIR)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF) + $(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF) $(MSWDIR)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF) @@ -1019,19 +1022,19 @@ jpeg: $(CFG) cd $(WXDIR)\src\jpeg make -f makefile.b32 cd $(WXDIR)\src\msw + +clean_jpeg: + cd $(WXDIR)\src\jpeg make -f makefile.b32 clean cd $(WXDIR)\src\msw -regex: $(CFG) +regex: $(CFG) cd $(WXDIR)\src\regex - make -f makefile.b32 + make -f makefile.b32 lib cd $(WXDIR)\src\msw clean_regex: cd $(WXDIR)\src\regex - -clean_jpeg: - cd $(WXDIR)\src\jpeg make -f makefile.b32 clean cd $(WXDIR)\src\msw diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 44f6760c74..583e4f3e81 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # @@ -107,6 +107,7 @@ COMMONOBJS = \ $(MSWDIR)\appcmn.obj \ $(MSWDIR)\choiccmn.obj \ $(MSWDIR)\clipcmn.obj \ + $(MSWDIR)\clntdata.obj \ $(MSWDIR)\cmdline.obj \ $(MSWDIR)\cmdproc.obj \ $(MSWDIR)\cmndata.obj \ @@ -504,6 +505,8 @@ $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) +$(MSWDIR)\clntdata.obj: $(COMMDIR)\clntdata.$(SRCSUFF) + $(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF) $(MSWDIR)\cmdproc.obj: $(COMMDIR)\cmdproc.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 88e1d4a415..ae4330fea9 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -91,6 +91,7 @@ COMMONOBJS1 = \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\choiccmn.obj \ $(COMMDIR)\clipcmn.obj \ + $(COMMDIR)\clntdata.obj \ $(COMMDIR)\cmdline.obj \ $(COMMDIR)\cmdproc.obj \ $(COMMDIR)\cmndata.obj \ @@ -790,6 +791,11 @@ $(COMMDIR)/clipcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/clntdata.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/cmdline.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 8f76c60d6b..1adb5a060b 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -102,6 +102,7 @@ COMMONOBJS = \ $(COMMDIR)/appcmn.$(OBJSUFF) \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ $(COMMDIR)/clipcmn.$(OBJSUFF) \ + $(COMMDIR)/clntdata.$(OBJSUFF) \ $(COMMDIR)/cmdline.$(OBJSUFF) \ $(COMMDIR)/cmdproc.$(OBJSUFF) \ $(COMMDIR)/cmndata.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index c347579440..65604cbd7f 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -60,6 +60,7 @@ COMMONOBJS = \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\choiccmn.obj \ $(COMMDIR)\clipcmn.obj \ + $(COMMDIR)\clntdata.obj \ $(COMMDIR)\cmdline.obj \ $(COMMDIR)\cmdproc.obj \ $(COMMDIR)\cmndata.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 9dcf51c473..991f7aeec9 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 10:56, 2001/10/08 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -139,6 +139,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\appcmn.obj \ $(COMMDIR)\$D\choiccmn.obj \ $(COMMDIR)\$D\clipcmn.obj \ + $(COMMDIR)\$D\clntdata.obj \ $(COMMDIR)\$D\cmdline.obj \ $(COMMDIR)\$D\cmdproc.obj \ $(COMMDIR)\$D\cmndata.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 65b8fcdaca..7f9c142f80 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 14:54, 2001/09/26 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -99,6 +99,7 @@ COMMONOBJS = & appcmn.obj & choiccmn.obj & clipcmn.obj & + clntdata.obj & cmdline.obj & cmdproc.obj & cmndata.obj & @@ -717,6 +718,9 @@ choiccmn.obj: $(COMMDIR)\choiccmn.cpp clipcmn.obj: $(COMMDIR)\clipcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +clntdata.obj: $(COMMDIR)\clntdata.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + cmdline.obj: $(COMMDIR)\cmdline.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/os2/files.lst b/src/os2/files.lst index 4c5962cecd..002aa38c92 100644 --- a/src/os2/files.lst +++ b/src/os2/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 16:58, 2001/09/21 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -44,6 +44,7 @@ ALL_SOURCES = \ common/appcmn.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ + common/clntdata.cpp \ common/cmdline.cpp \ common/cmdproc.cpp \ common/cmndata.cpp \ @@ -276,7 +277,9 @@ ALL_HEADERS = \ choicdlg.h \ choice.h \ clipbrd.h \ + clntdata.h \ cmdline.h \ + cmdproc.h \ cmndata.h \ colordlg.h \ colour.h \ @@ -584,6 +587,7 @@ ALL_HEADERS = \ generic/progdlgg.h \ generic/sashwin.h \ generic/scrolwin.h \ + generic/spinctlg.h \ generic/splash.h \ generic/splitter.h \ generic/statusbr.h \ @@ -614,6 +618,7 @@ COMMONOBJS = \ appcmn.o \ choiccmn.o \ clipcmn.o \ + clntdata.o \ cmdline.o \ cmdproc.o \ cmndata.o \ diff --git a/src/univ/files.lst b/src/univ/files.lst index 3610900231..78a6b08267 100644 --- a/src/univ/files.lst +++ b/src/univ/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:01, 2001/09/25 +# This file was automatically generated by tmake at 14:59, 2001/10/09 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T! UNIVOBJS = \ bmpbuttn.o \ @@ -6,6 +6,7 @@ UNIVOBJS = \ checkbox.o \ checklst.o \ colschem.o \ + combobox.o \ control.o \ dialog.o \ framuniv.o \ -- 2.47.2