compilation for Win32 using configure works again

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

distrib/msw/tmake/msw.t

@@ -0,0 +1,128 @@
+#!################################################################################
+#! File:    msw.t
+#! Purpose: tmake template file from which src/msw/files.lst containing the
+#!          list of files for wxMSW library is generated by tmake
+#! Author:  Vadim Zeitlin
+#! Created: 28.01.00
+#! Version: $Id$
+#!################################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxMSW, %wxMOTIF and
+    #! %wxOS2PM hashes.
+    IncludeTemplate("filelist.t");
+
+    #! find all our sources
+    $project{"COMMONOBJS"} .= "parser.o ";
+    $project{"COMMONDEPS"} .= "parser.d ";
+
+    foreach $file (sort keys %wxGeneric) {
+        next if $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"MSW_SOURCES"} .= "generic/" . $file . " ";
+        $project{"GENERICOBJS"} .= $fileobj . " ";
+        $project{"GENERICDEPS"} .= $filedep . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\bR\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"MSW_SOURCES"} .= "common/" . $file . " ";
+        $project{"COMMONOBJS"} .= $fileobj . " ";
+        $project{"COMMONDEPS"} .= $filedep . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        #! OLE files can'be compiled with mingw32 yet
+        next if $wxMSW{$file} =~ /\b(O|16)\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"MSW_SOURCES"} .= "msw/" . $file . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+        $project{"GUIDEPS"} .= $filedep . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"MSW_SOURCES"} .= "html/" . $file . " ";
+        $project{"HTMLOBJS"} .= $fileobj . " ";
+        $project{"HTMLDEPS"} .= $filedep . " "
+    }
+    #! find all our headers
+    foreach $file (sort keys %wxWXINCLUDE) {
+        $project{"MSW_HEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxMSWINCLUDE) {
+        $project{"MSW_HEADERS"} .= "msw/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxGENERICINCLUDE) {
+        $project{"MSW_HEADERS"} .= "generic/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxUNIXINCLUDE) {
+        $project{"MSW_HEADERS"} .= "unix/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxHTMLINCLUDE) {
+        $project{"MSW_HEADERS"} .= "html/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxPROTOCOLINCLUDE) {
+        $project{"MSW_HEADERS"} .= "protocol/" . $file . " "
+    }
+#$}
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
+ALL_SOURCES = \
+		#$ ExpandList("MSW_SOURCES");
+
+ALL_HEADERS = \
+		#$ ExpandList("MSW_HEADERS");
+
+COMMONOBJS = \
+		#$ ExpandList("COMMONOBJS");
+
+COMMONDEPS = \
+		#$ ExpandList("COMMONDEPS");
+
+GENERICOBJS = \
+		#$ ExpandList("GENERICOBJS");
+
+GENERICDEPS = \
+		#$ ExpandList("GENERICDEPS");
+
+GUIOBJS = \
+		#$ ExpandList("GUIOBJS");
+
+GUIDEPS = \
+		#$ ExpandList("GUIDEPS");
+
+UNIXOBJS = \
+		#$ ExpandList("UNIXOBJS");
+
+UNIXDEPS = \
+		#$ ExpandList("UNIXDEPS");
+
+HTMLOBJS = \
+		#$ ExpandList("HTMLOBJS");
+
+HTMLDEPS = \
+		#$ ExpandList("HTMLDEPS");
+
+IODBCOBJS = \
+		#$ ExpandList("IODBCOBJS");
+
+IODBCDEPS = \
+		#$ ExpandList("IODBCDEPS");

src/msw/dirdlg.cpp

@@ -27,6 +27,9 @@
     #pragma hdrstop
 #endif
 
+#if defined(__WIN95__) && \
+    (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
@@ -36,29 +39,21 @@
 
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && \
+#include "shlobj.h" // Win95 shell
-    (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
-    #define CAN_COMPILE_DIRDLG
-//#else: we provide a stub version which doesn't do anything
-#endif
-
-#ifdef CAN_COMPILE_DIRDLG
-    #include "shlobj.h" // Win95 shell
-#endif
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 #ifndef MAX_PATH
-    #define MAX_PATH 4096      // be generuous
+    #define MAX_PATH 4096      // be generous
 #endif
 
 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------
 
-    IMPLEMENT_CLASS(wxDirDialog, wxDialog)
+IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 
 // ----------------------------------------------------------------------------
 // private functions prototypes
@@ -71,6 +66,7 @@ static void ItemListFree(LPITEMIDLIST pidl);
 static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp,
                                        LPARAM pData);
 
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -93,7 +89,6 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
 
 int wxDirDialog::ShowModal()
 {
-#ifdef CAN_COMPILE_DIRDLG
     BROWSEINFO bi;
     bi.hwndOwner      = m_parent ? GetHwndOf(m_parent) : NULL;
     bi.pidlRoot       = NULL;
@@ -129,9 +124,6 @@ int wxDirDialog::ShowModal()
     }
 
     return wxID_OK;
-#else // !CAN_COMPILE_DIRDLG
-    return wxID_CANCEL;
-#endif // CAN_COMPILE_DIRDLG/!CAN_COMPILE_DIRDLG
 }
 
 // ----------------------------------------------------------------------------
@@ -188,3 +180,6 @@ static void ItemListFree(LPITEMIDLIST pidl)
     }
 }
 
+#else
+    #include "../generic/dirdlgg.cpp"
+#endif // compiler/platform on which the code here compiles