From aeab10d07c1f4ef78c0c9152de115fa216922e6c Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 5 May 1999 08:57:41 +0000
Subject: [PATCH] wxNotebook fixes for Win16;  VC++ 4 fixes for OLE files;
 wxGA_SMOOTH flag (wxMSW); wxFRAME_FLOAT_ON_PARENT style for frames (wxMSW) to
 get traditional MSW behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/gtk/todo.txt        | Bin 680 -> 866 bytes
 docs/latex/wx/frame.tex  |   6 ++++
 docs/latex/wx/window.tex |  15 +++++++-
 docs/symbols.txt         | Bin 1414 -> 1682 bytes
 include/wx/defs.h        |   4 +++
 src/generic/notebook.cpp |  48 +++++++++++++++++++++-----
 src/msw/frame.cpp        |   7 +++-
 src/msw/gauge95.cpp      |   5 +++
 src/msw/ole/automtn.cpp  |   4 +--
 src/msw/ole/oleutils.cpp |  18 ++++++++++
 utils/makefile.vc        |  72 ++++++++++++++++++---------------------
 11 files changed, 129 insertions(+), 50 deletions(-)

diff --git a/docs/gtk/todo.txt b/docs/gtk/todo.txt
index 1db16e96c2a58580eea6e00c398b00ffad095455..60b2b0d642ece9f969e2f6f660447c08e335cd9a 100644
GIT binary patch
delta 295
zcmZ3%`iN~qBBLw=5>NmFE+js~<TOTKiNrkh5{0Bxh2qo_RLL!jD&feg6%=&s6aw;#
zOA7MyQd9I$6r&mJnOl&Pnwy$eqEKEDkeHKNQj&_IeDZ%rO=(oKQRTInG<lHa32JCy
a5-~>BfQ1cqe|UarP727od6~(ndRzd;fg>9L

delta 123
zcmaFFwt{s-A|tB;5O7VdWAtU@n*5kiMO{Hb*G?fIzqq6zKQA>!j|(X4nOl&Pnwy$e
zqEKEDkeHKNQj*FwIgUw_8KiR&lO~9*4P-m#=NF_FC6;97=P8tDmSiXdmH@Q_jSJ5&
R%}G&6N>#|qOitC~0syQxBwGLg

diff --git a/docs/latex/wx/frame.tex b/docs/latex/wx/frame.tex
index ebe13b0449..274958d01a 100644
--- a/docs/latex/wx/frame.tex
+++ b/docs/latex/wx/frame.tex
@@ -33,6 +33,12 @@ the remaining size available to application windows.
 \twocolitem{\windowstyle{wxSYSTEM\_MENU}}{Displays a system menu (Windows and Motif only).}
 \twocolitem{\windowstyle{wxTHICK\_FRAME}}{Displays a thick frame around the window (Windows and Motif only).}
 \twocolitem{\windowstyle{wxRESIZE\_BORDER}}{Displays a resizeable border around the window (Motif only).}
+\twocolitem{\windowstyle{wxFRAME\_FLOAT\_ON\_PARENT}}{Windows only. Causes the frame to be above the parent window in the
+z-order and not shown in the taskbar. Without this style, frames are created as top-level windows that may be obscured by
+the parent window, and frame titles are shown in the taskbar. On Motif and GTK, the behaviour is always as if this
+style is not specified.}
+\twocolitem{\windowstyle{wxFRAME\_TOOL\_WINDOW}}{Windows only. Causes a frame with a small titlebar to be created;
+the frame title does not appear in the taskbar.}
 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}. Currently the GTK port of wxWindows
diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index e267566210..d2abf20559 100644
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -721,6 +721,12 @@ only be called within an \helpref{OnPaint}{wxwindowonpaint} event handler.
 
 \helpref{wxRegion}{wxregion}, \helpref{wxRegionIterator}{wxregioniterator}, \helpref{wxWindow::OnPaint}{wxwindowonpaint}
 
+\membersection{wxWindow::GetValidator}\label{wxwindowgetvalidator}
+
+\constfunc{wxValidator*}{GetValidator}{\void}
+
+Returns a pointer to the current validator for the window, or NULL if there is none.
+
 \membersection{wxWindow::GetWindowStyleFlag}
 
 \constfunc{long}{GetWindowStyleFlag}{\void}
@@ -2118,7 +2124,14 @@ Sets the window's title. Applicable only to frames and dialogs.
 
 \helpref{wxWindow::GetTitle}{wxwindowgettitle}
 
-\membersection{wxWindow::Show}
+\membersection{wxWindow::SetValidator}\label{wxwindowsetvalidator}
+
+\func{virtual void}{SetValidator}{\param{const wxValidator\&}{ validator}}
+
+Deletes the current validator (if any) and sets the window validator, having called wxValidator::Clone to
+create a new validator of this type.
+
+\membersection{wxWindow::Show}\label{wxwindowshow}
 
 \func{virtual bool}{Show}{\param{const bool}{ show}}
 
diff --git a/docs/symbols.txt b/docs/symbols.txt
index 1b2865d1cf8cd49680309865a622ac07acf3b1e9..e23aa1d02348a179cb5678b9fbdbae4a1efae4f2 100644
GIT binary patch
literal 1682
zcmb7ETTk0C6z18#;z)Y{MCk^D2S6JNr7O|ev}zKXH_J&}YAKg0c7Xi*9p_$(v|_cf
zeJ-ER-Ps5U_+t<WsUTg$HsjkY4Y-tP2C|6#G?I`@9)d_fZ8*HWuS622ZxUphX8|7)
zGI33LOV0Hogi?=E=oU)~@CM-L3X)X8#QBRND{nS;%s;i@ELCD%Qaz{B_0%22xyo4-
z6~NzvD3{_D-xq2FE02}{aB_cIDk5yF**t;!#br&!Gh7TW0iD{2mkrM<BkWbHWuTq4
zXBE#FwY(V%<~CAY%j`L)J#!QBPL6sDeKW1c`O2=9wNL}w6FVy9Zm!!WFov*3>zd%+
zTmwr&V1D|_@4#~4YWSn042cf>E}qqk9ke)>^FeIojohU@uI;PNdm^^uJ~STKD))WN
z|0~a=NE0|YRy^KDO!4EY7(n2a$2?I?p};BGfin|Wvp@}W@f098X&!~(bES9&m|BpE
zWva@mt_v(PsW=ODEn;xeBr1kL^uMi{9r&Hg+~)Fo%z}+bI96moK0B8_qdHUiv~V%E
z{}r>JmscpZmydnOK84b$X&r_?F%Pi9ojOZhiUgbTWAyv)?w=`ro?&Lm=W!lj%rVYo
zTj=sDZ&jy~^0HfWpTQf`#glP>3r1=GKEk0CN*@i!pp&sRUK&&FQPXB$>Z6~RU@S~h
z4m9i)Yz*?nYX3Oh&e0A;4bpfkA{;b}1%c7o8J05kZvnb<u+d`@=>Q{xpk%q*Ma&Y#
zgYr^`0n=sLt}$(9(X&=)dA4hf8V-P+ComdyT(8yA)A;_rGpPn>M7xn5r(v&g%8B0l
zH1f@^tK)I};7-~pmP_`+Z{eF*hg|n>$3OY?8$#~qFQDHT0FNXGq-8wfO!8AwZ~p)r
CjBkJd

delta 717
zcmX|9OODe(5LHHmMI$5@pphVpl3)RvjAzKO%3?&vc06VrJMt&atXfUnnOO2CvK@u6
znH>kfC*THLfD3R1PQeW*w@rFsSJ!*5s=BJaKmGRP=d?FqEHrJ+2|dQ3IXpW+7-vzw
zFG>Bi_wl79T#Y&y0O?mFpmUSdzk9FhzrEA?`H5PuPV@_ZBOuR`0~mo>LY!_Bk&3Jm
z5v=n9M#?4dLI4I_8vZR~^|MEVhl8jTpqMlhdlZXu2q@#FfU@F61r^4O#5&Fd?Bi-9
z)e0ewC(4VIuQmvjV?r3anFmY8(C`-Sht|0B7Sgax`#)xw(i2#|Yc});#wMO7eTy0P
zpwS2R@v$IF^LAP5cRGe+QP*s3YRzw`)KM9bF^&3^8M>{z)RKVXP33>;>Ux`usCl}L
z6H$~8V{(2x%`*%;kR5JIFtXh_P6Hdh>J&)PJ{j}*u|#=mg~rhdC<OKF3_B_(x=nb6
zGf0s)aa@bqn%Z);NnRv8iyAV5A@x;f)?pCx3e$FwcQ>Q9ud6NS9a4^yT}iP1(SK3@
z>Yvts`hz!Q|E1d>Nb{%}&hdSnK}dc5cy=2uHGL8oa_gGUuH^S(46oxgw7}cTF%&{B
d!w}w&A&s**<q59C=iNOvBoaeV6y+Tu{{R|F(cb_7

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 90ac41fb0a..2b51d4fae6 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -397,6 +397,8 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxRESIZE_BORDER         0x0040
 #define wxDIALOG_MODAL          0x0020
 #define wxDIALOG_MODELESS       0x0000
+/* Add for normal Windows frame behaviour */
+#define wxFRAME_FLOAT_ON_PARENT 0x0020
 
 #define wxDEFAULT_FRAME_STYLE    (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
 
@@ -498,6 +500,8 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxGA_PROGRESSBAR     0x0004
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
+/* Windows only */
+#define wxGA_SMOOTH          0x0008
 
 /*
  * wxSlider flags
diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 90782f4545..e33702a3d5 100644
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -146,10 +146,13 @@ int wxNotebook::SetSelection(int nPage)
 
     wxASSERT( IS_VALID_PAGE(nPage) );
 
+#if defined (__WIN16__)
+    m_tabView->SetTabSelection(nPage);
+#else
     wxNotebookPage* pPage = GetPage(nPage);
 
     m_tabView->SetTabSelection((int) (long) pPage);
-
+#endif
     // TODO
     return 0;
 }
@@ -167,7 +170,11 @@ void wxNotebook::AdvanceSelection(bool bForward)
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
-
+#if defined (__WIN16__)
+	m_tabView->SetTabText(nPage, strText);
+    Refresh();
+    return TRUE;
+#else
     wxNotebookPage* page = GetPage(nPage);
     if (page)
     {
@@ -175,7 +182,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
         Refresh();
         return TRUE;
     }
-
+#endif
     return FALSE;
 }
 
@@ -183,11 +190,15 @@ wxString wxNotebook::GetPageText(int nPage) const
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
+#if defined (__WIN16__)
+    return m_tabView->GetTabText(nPage);
+#else
     wxNotebookPage* page = ((wxNotebook*)this)->GetPage(nPage);
     if (page)
         return m_tabView->GetTabText((int) (long) page);
     else
         return wxEmptyString;
+#endif
 }
 
 int wxNotebook::GetPageImage(int nPage) const
@@ -228,7 +239,11 @@ bool wxNotebook::DeletePage(int nPage)
     }
 
     wxNotebookPage* pPage = GetPage(nPage);
+#if defined (__WIN16__)
+    m_tabView->RemoveTab(nPage);
+#else
     m_tabView->RemoveTab((int) (long) pPage);
+#endif
 
     delete m_aPages[nPage];
     m_aPages.Remove(nPage);
@@ -241,7 +256,11 @@ bool wxNotebook::DeletePage(int nPage)
     else if (m_nSelection > -1)
     {
       m_nSelection = -1;
+#if defined (__WIN16__)
+      m_tabView->SetTabSelection(0, FALSE);
+#else
       m_tabView->SetTabSelection((int) (long) GetPage(0), FALSE);
+#endif
       if (m_nSelection != 0)
         ChangePage(-1, 0);
     }
@@ -269,7 +288,11 @@ bool wxNotebook::RemovePage(int nPage)
     //    m_aPages[nPage]->Lower();
 
     wxNotebookPage* pPage = GetPage(nPage);
+#if defined (__WIN16__)
+    m_tabView->RemoveTab(nPage);
+#else
     m_tabView->RemoveTab((int) (long) pPage);
+#endif
 
     m_aPages.Remove(nPage);
 
@@ -357,7 +380,12 @@ bool wxNotebook::InsertPage(int nPage,
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
 
+// For 16 bit integers (tabs limited to 32768)
+#if defined (__WIN16__)
+    m_tabView->AddTab(nPage, strText);
+#else
     m_tabView->AddTab((int) (long) pPage, strText);
+#endif
     if (!bSelect)
       pPage->Show(FALSE);
 
@@ -367,7 +395,11 @@ bool wxNotebook::InsertPage(int nPage,
     if (bSelect)
     {
         // This will cause ChangePage to be called, via OnSelPage
+#if defined (__WIN16__)
+        m_tabView->SetTabSelection(nPage, TRUE);
+#else
         m_tabView->SetTabSelection((int) (long) pPage, TRUE);
+#endif
     }
 
     // some page must be selected: either this one or the first one if there is
@@ -601,11 +633,6 @@ wxRect wxNotebook::GetAvailableClientSize()
     return rect;
 }
 
-void wxNotebook::SetTabSize(const wxSize& sz)
-{
-    // TODO
-}
-
 /*
  * wxNotebookTabView
  */
@@ -638,6 +665,10 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
 #endif
 
+#if defined (__WIN16__)
+  int activatePos = activateId;
+  int deactivatePos = deactivateId;
+#else
   // Translate from wxTabView's ids (which aren't position-dependent)
   // to wxNotebook's (which are).
   wxNotebookPage* pActive = (wxNotebookPage*) activateId;
@@ -646,6 +677,7 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   int activatePos = m_notebook->FindPagePosition(pActive);
   int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 
+#endif
   event.SetEventObject(m_notebook);
   event.SetSelection(activatePos);
   event.SetOldSelection(deactivatePos);
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index a96d6d99b6..c16843cb8a 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -119,7 +119,12 @@ bool wxFrame::Create(wxWindow *parent,
 
   // we pass NULL as parent to MSWCreate because frames with parents behave
   // very strangely under Win95 shell
-  MSWCreate(m_windowId, NULL, wxFrameClassName, this, title,
+  // Alteration by JACS: keep normal Windows behaviour (float on top of parent)
+  // with this style.
+  if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
+    parent = NULL;
+
+  MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
             x, y, width, height, style);
 
   wxModelessWindows.Append(this);
diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index d287e72444..9e16993a83 100644
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -68,6 +68,11 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
+  if (m_windowStyle & wxGA_VERTICAL)
+    msFlags |= PBS_VERTICAL;
+
+  if (m_windowStyle & wxGA_SMOOTH)
+    msFlags |= PBS_SMOOTH;
 
   HWND wx_button =
       CreateWindowEx(MakeExtendedStyle(m_windowStyle), PROGRESS_CLASS, NULL, msFlags,
diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 108c2948b0..6dff2255e4 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -540,7 +540,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
     {
         oleVariant.vt = VT_BOOL;
         // 'bool' required for VC++ 4 apparently
-#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000))
+#if defined(__WATCOMC__) || (defined(__VISUALC__) && (__VISUALC__ <= 1000))
         oleVariant.bool = variant.GetBool();
 #else
         oleVariant.boolVal = variant.GetBool();
@@ -668,7 +668,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 
 	case VT_BOOL:
 		{
-#ifdef __WATCOMC__
+#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000)) //GC
 			variant = (bool) (oleVariant.bool != 0);
 #else
 			variant = (bool) (oleVariant.boolVal != 0);
diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index e67ac95611..58b3cd8a16 100644
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -184,6 +184,24 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
   wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
 }
 
+#elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)
+
+// For VC++ 4
+void wxLogQueryInterface(const char *szInterface, REFIID riid)
+{
+  wxLogTrace("%s::QueryInterface", szInterface);
+}
+
+void wxLogAddRef(const char *szInterface, ULONG cRef)
+{
+  wxLogTrace("After %s::AddRef: m_cRef = %d", szInterface, cRef + 1);
+}
+
+void wxLogRelease(const char *szInterface, ULONG cRef)
+{
+  wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
+}
+
 #endif  //WXDEBUG
 
 #endif
diff --git a/utils/makefile.vc b/utils/makefile.vc
index 7679e9d9a7..ece8395fe1 100644
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,5 +1,5 @@
 #
-# File:		makefile.nt
+# File:		makefile.vc
 # Author:	Julian Smart
 # Created:	1993
 # Updated:	
@@ -23,74 +23,70 @@ LINK_DEBUG_FLAGS="/RELEASE"
 
 all:
         cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-        cd $(WXDIR)\utils\wxprop\src
-        nmake -f makefile.nt test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\hytext\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\mfutils\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wxbuild\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.nt test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.nt test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wximage\win
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wxweb\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wxhelp2\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\clockwrk\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wxanim\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\colours
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\ogl\src
-#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.nt test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 
 clean:
-        cd $(WXDIR)\utils\wxprop\src
-        nmake -f makefile.nt clean
         cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.nt clean
+        nmake -f makefile.vc clean
         cd $(WXDIR)\utils\nplugin
-        nmake -f makefile.nt clean
+        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\hytext\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\mfutils\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wxbuild\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wxhelp2\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\clockwrk\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wxanim\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\colours
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\ogl\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wxweb\src
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
 #        cd $(WXDIR)\utils\wximage\win
-#        nmake -f makefile.nt clean
+#        nmake -f makefile.vc clean
-- 
2.50.0

