More mostly cross compiling related mods..

Get configure to bring in the necessary libs and object files if
the compiler can handle ole.
Added --enable-metafile option, defaults to yes but again only used
if ole is supported.
Fixed the last of the #ifdef wxUSE_NORLANDER.. tests to check if its
non-zero (it's always defined)


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

Makefile.in

@@ -42,6 +42,7 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
+VP12 = @top_srcdir@/src/ole
 
 FTVP01 = @top_srcdir@/src/freetype/unix
 FTVP02 = @top_srcdir@/src/freetype/autohint
@@ -59,13 +60,13 @@ FTVP13 = @top_srcdir@/src/freetype/type1
 FTVP14 = @top_srcdir@/src/freetype/type1z
 FTVP15 = @top_srcdir@/src/freetype/winfonts
 
-VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
-VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
+VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@

configure.in

@@ -1103,6 +1103,7 @@ dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(clipboard,   [  --enable-clipboard      use wxClipboard classes], wxUSE_CLIPBOARD)
 WX_ARG_ENABLE(dnd,         [  --enable-dnd            use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
+WX_ARG_ENABLE(metafile,    [  --enable-metafile       use win32 metafiles], wxUSE_METAFILE)
 
 dnl TODO: doesn't work yet
 WX_ARG_ENABLE(wxtree,      [  --enable-wxtree         make wxTree library], wxUSE_WXTREE)
@@ -3567,7 +3568,18 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
 	dnl this one does the right thing though
         if test "$ac_cv_header_ole2_h" = "yes" ; then
             if test "$GCC" = yes ; then
+                ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
+                ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
                 CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+                LIBS="$LIBS -lole32 -luuid"
+
+                dnl metafiles need the ole code, right??  if not this
+                dnl doesn't need to be in here.
+                if test "$wxUSE_METAFILE" = "yes"; then
+                    AC_DEFINE(wxUSE_METAFILE)
+                    dnl this one should probably be made separately configurable
+                    AC_DEFINE(wxUSE_ENH_METAFILE)
+                fi
             fi
         else
             AC_MSG_WARN(Drag and drop disabled because OLE headers not found)
@@ -3769,10 +3781,6 @@ dnl if test "$wxUSE_WXTREE" = "yes"; then
 dnl   AC_DEFINE(wxUSE_WXTREE)
 dnl fi
 
-if test "$wxUSE_METAFILE" = "yes"; then
-    AC_DEFINE(wxUSE_METAFILE)
-fi
-
 if test "$wxUSE_DIRDLG" = "yes"; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then
        AC_MSG_WARN(wxDirDialog requires constraints so it won't be compiled without them)

distrib/msw/tmake/msw.t

@@ -39,15 +39,20 @@
     }
 
     foreach $file (sort keys %wxMSW) {
-        #! OLE files can'be compiled with mingw32 yet
+        next if $wxMSW{$file} =~ /\b16\b/;
-        next if $wxMSW{$file} =~ /\b(O|16)\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
         ($filedep = $file) =~ s/cp?p?$/\d/;
 
+        if( $wxMSW{$file} =~ /\bO\b/ ) {
+            $project{"MSW_SOURCES"} .= "msw/ole/" . $file . " ";
+            $project{"OLEOBJS"} .= $fileobj . " ";
+            $project{"OLEDEPS"} .= $filedep . " ";
+        } else {
             $project{"MSW_SOURCES"} .= "msw/" . $file . " ";
             $project{"GUIOBJS"} .= $fileobj . " ";
-        $project{"GUIDEPS"} .= $filedep . " "
+            $project{"GUIDEPS"} .= $filedep . " ";
+        }
     }
 
     foreach $file (sort keys %wxHTML) {
@@ -121,6 +126,12 @@ HTMLOBJS = \
 HTMLDEPS = \
 		#$ ExpandList("HTMLDEPS");
 
+OLEOBJS = \
+		#$ ExpandList("OLEOBJS");
+
+OLEDEPS = \
+		#$ ExpandList("OLEDEPS");
+
 IODBCOBJS = \
 		#$ ExpandList("IODBCOBJS");
 

include/wx/dirdlg.h

@@ -10,7 +10,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 #if defined(__WXMSW__)
-#if defined(__WIN16__) || (defined(__GNUWIN32__)&&!defined(wxUSE_NORLANDER_HEADERS)) || defined(__SALFORDC__)
+#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
 #include "wx/generic/dirdlgg.h"
 #else
 #include "wx/msw/dirdlg.h"

include/wx/msw/ole/oleutils.h

@@ -17,7 +17,7 @@
 #endif
 
 #include "wx/defs.h"
-#ifdef wxUSE_NORLANDER_HEADERS
+#if wxUSE_NORLANDER_HEADERS
 #include <ole2.h>
 #endif
 // ============================================================================

include/wx/msw/private.h

@@ -59,7 +59,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // define things missing from some compilers' headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
+#if defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS
 #ifndef ZeroMemory
     inline void ZeroMemory(void *buf, size_t len) { memset(buf, 0, len); }
 #endif

include/wx/msw/setup0.h

@@ -721,9 +721,11 @@
 // disable the settings which don't work for some compilers
 // ----------------------------------------------------------------------------
 
-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
 #ifndef wxUSE_NORLANDER_HEADERS
+#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
 #   define wxUSE_NORLANDER_HEADERS 1
+#else
+#   define wxUSE_NORLANDER_HEADERS 0
 #endif
 #endif
 

setup.h.in

@@ -574,6 +574,7 @@
  * Support for metafiles
  */
 #define wxUSE_METAFILE 0
+#define wxUSE_ENH_METAFILE 0
 
 /*
  * wxMiniFrame

src/msw/dibutils.cpp

@@ -167,7 +167,7 @@ int wxDibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
   bmf.bfReserved1 = 0;
   bmf.bfReserved2 = 0;
   bmf.bfOffBits = sizeof(bmf) + (char FAR*)(wxDibPtr(lpbi)) - (char FAR*)lpbi;
-#if 1 // defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) || defined(wxUSE_NORLANDER_HEADERS)
+#if 1 // defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) || wxUSE_NORLANDER_HEADERS
   #define HWRITE_2ND_ARG_TYPE   LPCSTR
 #else // don't know who needs this...
   #define HWRITE_2ND_ARG_TYPE   LPBYTE

src/msw/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:14, 2001/02/06
+# This file was automatically generated by tmake at 02:34, 2001/02/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -134,6 +134,7 @@ ALL_SOURCES = \
 		common/zstream.cpp \
 		msw/accel.cpp \
 		msw/app.cpp \
+		msw/ole/automtn.cpp \
 		msw/bitmap.cpp \
 		msw/bmpbuttn.cpp \
 		msw/brush.cpp \
@@ -150,6 +151,7 @@ ALL_SOURCES = \
 		msw/curico.cpp \
 		msw/cursor.cpp \
 		msw/data.cpp \
+		msw/ole/dataobj.cpp \
 		msw/dc.cpp \
 		msw/dcclient.cpp \
 		msw/dcmemory.cpp \
@@ -163,6 +165,8 @@ ALL_SOURCES = \
 		msw/dir.cpp \
 		msw/dirdlg.cpp \
 		msw/dragimag.cpp \
+		msw/ole/dropsrc.cpp \
+		msw/ole/droptgt.cpp \
 		msw/enhmeta.cpp \
 		msw/filedlg.cpp \
 		msw/font.cpp \
@@ -193,6 +197,7 @@ ALL_SOURCES = \
 		msw/msgdlg.cpp \
 		msw/nativdlg.cpp \
 		msw/notebook.cpp \
+		msw/ole/oleutils.cpp \
 		msw/ownerdrw.cpp \
 		msw/palette.cpp \
 		msw/pen.cpp \
@@ -224,6 +229,7 @@ ALL_SOURCES = \
 		msw/treectrl.cpp \
 		msw/utils.cpp \
 		msw/utilsexc.cpp \
+		msw/ole/uuid.cpp \
 		msw/wave.cpp \
 		msw/window.cpp \
 		msw/xpmhand.cpp \
@@ -1121,6 +1127,22 @@ HTMLDEPS = \
 		m_tables.d \
 		winpars.d
 
+OLEOBJS = \
+		automtn.o \
+		dataobj.o \
+		dropsrc.o \
+		droptgt.o \
+		oleutils.o \
+		uuid.o
+
+OLEDEPS = \
+		automtn.d \
+		dataobj.d \
+		dropsrc.d \
+		droptgt.d \
+		oleutils.d \
+		uuid.d
+
 IODBCOBJS = \
 
 IODBCDEPS = \

src/msw/ole/dataobj.cpp

@@ -39,7 +39,7 @@
 
 #include "wx/msw/private.h"         // includes <windows.h>
 
-#ifdef wxUSE_NORLANDER_HEADERS
+#if wxUSE_NORLANDER_HEADERS
   #include <ole2.h>
 #endif
 #include <oleauto.h>

src/msw/ole/dropsrc.cpp

@@ -40,7 +40,7 @@
 
 #include <windows.h>
 
-#ifdef wxUSE_NORLANDER_HEADERS
+#if wxUSE_NORLANDER_HEADERS
     #include <ole2.h>
 #endif
 

src/msw/ole/droptgt.cpp

@@ -35,7 +35,7 @@
 #include "wx/log.h"
 
 #ifdef __WIN32__
-    #ifndef __GNUWIN32__
+    #if !defined(__GNUWIN32__) || wxUSE_NORLANDER_HEADERS
         #include <shlobj.h>            // for DROPFILES structure
     #endif
 #else