2 GnuWin32 compile bugs fixed, incl. printf bug in prntdlgg that sent GnuWin32

into an endless loop

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 295aca336ba586b094f3a6a97ad7e1b15fff6071..cb4b81d8180a0354f89f2a4bbf88dce2c8a40cb0 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -844,14 +844,12 @@ bool wxRemoveFile(const wxString& file)
 
 bool wxMkdir(const wxString& dir)
 {
-#ifdef __VMS__
+#if defined(__WXSTUBS__)
+  return FALSE;
+#elif defined(__VMS__)
        return FALSE;
 #elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
-#if defined(__WIN32__) // Could happen in __WXSTUBS__ mode
-  return (mkdir(WXSTRINGCAST dir) == 0);
-#else
   return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
-#endif
 #else
   return (mkdir(WXSTRINGCAST dir) == 0);
 #endif

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 17c6466ad6b7f79c463e6fc8351a92c3e7859aca..9a997388d1ae5c280299c058a22a45a44860f3b5 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -235,7 +235,7 @@ bool wxGenericPrintDialog::TransferDataToWindow(void)
          
          sprintf(buf, "%d", printData.GetFromPage());
          fromText->SetValue(buf);
-         sprintf(buf, "%   d", printData.GetFromPage());
+         sprintf(buf, "%d", printData.GetFromPage());
          toText->SetValue(buf);
          
          if (printData.GetAllPages())