From b36d8c8f112a9a649d659573677c25a294ca8a3c Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Sat, 17 Nov 2001 15:36:48 +0000 Subject: [PATCH 1/1] cast away a couple of warnings and added *.inc to the MANUAL_DIST target git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 1 + src/msw/toplevel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7130a49d71..acfa397aed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1296,6 +1296,7 @@ MANUAL_DIST: mkdir $(DISTDIR)/docs/latex mkdir $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx + cp $(DOCDIR)/latex/wx/*.inc $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 005d4a78bf..9aeb9eefd5 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -258,7 +258,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate, // and passing CW_USEDEFAULT to MoveWindow() results in resizing the // window to (0, 0) size which breaks quite a lot of things, e.g. the // sizer calculation in wxSizer::Fit() - if ( w == CW_USEDEFAULT ) + if ( w == (int)CW_USEDEFAULT ) { // the exact number doesn't matter, the dialog will be resized // again soon anyhow but it should be big enough to allow @@ -268,7 +268,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate, h = 100; } - if ( x == CW_USEDEFAULT ) + if ( x == (int)CW_USEDEFAULT ) { // well, where should we put it? maybe centre it on screen? x = -- 2.45.2