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

diff --git a/Makefile.in b/Makefile.in
index 7130a49d717061ef26aae648765ab7af65d24757..acfa397aed25b48477f4fb47cf3c8d2489bf5bec 100644 (file)
--- 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
        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
        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 005d4a78bf4c7625427183f98a605c9a77455466..9aeb9eefd5ad77bfd9503f130e43f5078d60ab7c 100644 (file)
--- 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()
         // 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
         {
             // 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;
         }
 
             h = 100;
         }
 

-        if ( x == CW_USEDEFAULT )
+        if ( x == (int)CW_USEDEFAULT )

         {
             // well, where should we put it? maybe centre it on screen?
             x =
         {
             // well, where should we put it? maybe centre it on screen?
             x =