From 79bc2382e3b0cc4480864f2c6d891063a5328a18 Mon Sep 17 00:00:00 2001 From: Patrick Albert Date: Fri, 27 Aug 1999 13:16:09 +0000 Subject: [PATCH] Adding GetPrevSibling() & GetNextSibling() in winundef.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/vc.t | 12 ++++++++---- include/wx/msw/winundef.h | 20 ++++++++++++++++++++ src/msw/makefile.dos | 6 ++++++ src/msw/makefile.vc | 1 + 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 546b3298d2..8d2c17b8b3 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -516,25 +516,29 @@ $(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex cd $(DOCDIR)\latex\wx - -copy *.bmp *.wmf $(DOCDIR)\pdf + -copy *.wmf $(DOCDIR)\pdf + -copy *.bmp $(DOCDIR)\pdf -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf cd $(THISDIR) $(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex cd $(DOCDIR)\latex\porting - -copy *.bmp *.wmf $(DOCDIR)\pdf + -copy *.wmf $(DOCDIR)\pdf + -copy *.bmp $(DOCDIR)\pdf -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf cd $(THISDIR) $(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex cd $(DOCDIR)\latex\proplist - -copy *.bmp *.wmf $(DOCDIR)\pdf + -copy *.wmf $(DOCDIR)\pdf + -copy *.bmp $(DOCDIR)\pdf -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf cd $(THISDIR) $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref - -copy *.bmp *.wmf $(DOCDIR)\pdf + -copy *.wmf $(DOCDIR)\pdf + -copy *.bmp $(DOCDIR)\pdf -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf cd $(THISDIR) diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 2217085e1e..356bb06ab1 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -207,6 +207,26 @@ } #endif +// GetPrevSibling + +#ifdef GetPrevSibling + #undef GetPrevSibling + inline HWND GetPrevSibling(HWND hwnd) + { + return GetWindow(hwnd,GW_HWNDPREV); + } +#endif + +// GetNextSibling + +#ifdef GetNextSibling + #undef GetNextSibling + inline HWND GetNextSibling(HWND hwnd) + { + return GetWindow(hwnd,GW_HWNDNEXT); + } +#endif + // For WINE #if defined(GetWindowStyle) || defined(__WXWINE__) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 3b1d7fe0cd..78bdae7b24 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -117,6 +117,7 @@ COMMONOBJS = \ $(COMMDIR)\image.obj \ $(COMMDIR)\imaggif.obj \ $(COMMDIR)\imagjpeg.obj \ + $(COMMDIR)\imagpcx.obj \ $(COMMDIR)\imagpnm.obj \ $(COMMDIR)\intl.obj \ $(COMMDIR)\ipcbase.obj \ @@ -836,6 +837,11 @@ $(COMMDIR)/imagjpeg.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/imagpcx.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/imagpng.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 13a878eeb2..2a6b15d61c 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -152,6 +152,7 @@ COMMONOBJS = \ ..\common\$D\image.obj \ ..\common\$D\imaggif.obj \ ..\common\$D\imagjpeg.obj \ + ..\common\$D\imagpcx.obj \ ..\common\$D\imagpng.obj \ ..\common\$D\imagpnm.obj \ ..\common\$D\intl.obj \