Various fixes for various compilers...

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

src/common/db.cpp

@@ -33,11 +33,12 @@
 // SYNOPSIS STOP
 */
 
+#include "wx/wxprec.h"
+
 // Use this line for wxWindows v1.x
 //#include "wx_ver.h"
 // Use this line for wxWindows v2.x
 #include "wx/version.h"
-#include "wx/wxprec.h"
 
 #if wxMAJOR_VERSION == 2
 	#ifdef __GNUG__

src/html/htmlpars.cpp

@@ -81,7 +81,7 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
     i = begin_pos;
 
     while (i < end_pos) {
-        c = m_Source[i];
+        c = m_Source[(unsigned int) i];
 
         // continue building word:
         if (c != '<') {

src/html/m_image.cpp

@@ -366,7 +366,7 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 }
                 if (tag.HasParam("USEMAP")) {
                     mn = tag.GetParam( "USEMAP" );
-                    if (mn[ 0 ] == '#') {
+                    if (mn[ (unsigned int) 0 ] == '#') {
                         mn = mn.Mid( 1 );
                     }
                 }

src/html/m_layout.cpp

@@ -148,7 +148,7 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
                 wxString title = "";
                 wxString *src = m_WParser -> GetSource();
 
-                for (int i = tag.GetBeginPos(); i < tag.GetEndPos1(); i++) title += (*src)[i];
+                for (int i = tag.GetBeginPos(); i < tag.GetEndPos1(); i++) title += (*src)[(unsigned int) i];
                 wfr -> SetTitle(title);
             }
         }

src/makeg95.env

@@ -15,6 +15,9 @@ MINGW32VERSION=2.95
 # Set to the appropriate remove command
 RM=rm -f 
 
+# Set to the appropriate copy command
+COPY=cp
+
 ########################## Compiler ##################################
 
 # C++ compiler
@@ -145,7 +148,8 @@ endif
 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
 
-LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+#LIBS = $(WXLIB) $(WXDIR)/lib/libzlib.a $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+LIBS = $(WXLIB) -lpng -ljpeg -lzlib $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)
 

src/msw/accel.cpp

@@ -165,4 +165,6 @@ bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
 {
     MSG *msg = (MSG *)wxmsg;
 
-    return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); }
+    return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
+}
+

src/msw/fontdlg.cpp

@@ -42,6 +42,7 @@
 
 #include "wx/msw/private.h"
 #include "wx/cmndata.h"
+#include "wx/log.h"
 
 #include <math.h>
 #include <stdlib.h>

src/msw/fontenum.cpp

@@ -110,6 +110,12 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     return TRUE;
 }
 
+#if defined(__GNUWIN32__) && !defined(__MINGW32__)
+#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
+#else
+#define wxFONTENUMPROC FONTENUMPROC
+#endif
+
 void wxFontEnumeratorHelper::DoEnumerate()
 {
     HDC hDC = ::GetDC(NULL);
@@ -119,7 +125,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
     lf.lfCharSet = m_charset;
     wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
     lf.lfPitchAndFamily = 0;
-    ::EnumFontFamiliesEx(hDC, &lf, (FONTENUMPROC)wxFontEnumeratorProc,
+    ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
                          (LPARAM)this, 0 /* reserved */) ;
 #else // Win16
     ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc,

src/msw/makefile.g95

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:24, 1999/10/28
+# This file was automatically generated by tmake at 15:22, 1999/11/07
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -33,6 +33,10 @@ ZLIBDIR = $(WXDIR)/src/zlib
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 
+PNGLIB = $(WXDIR)/lib/libpng.a
+ZLIBLIB = $(WXDIR)/lib/libzlib.a
+JPEGLIB = $(WXDIR)/lib/libjpeg.a
+
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS = \
@@ -85,6 +89,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/filefn.$(OBJSUFF) \
 		$(COMMDIR)/filesys.$(OBJSUFF) \
 		$(COMMDIR)/fontcmn.$(OBJSUFF) \
+		$(COMMDIR)/fontmap.$(OBJSUFF) \
 		$(COMMDIR)/framecmn.$(OBJSUFF) \
 		$(COMMDIR)/fs_inet.$(OBJSUFF) \
 		$(COMMDIR)/fs_zip.$(OBJSUFF) \
@@ -204,6 +209,8 @@ MSWOBJS     = \
 		$(MSWDIR)/filedlg.$(OBJSUFF) \
 		$(MSWDIR)/font.$(OBJSUFF) \
 		$(MSWDIR)/fontdlg.$(OBJSUFF) \
+		$(MSWDIR)/fontenum.$(OBJSUFF) \
+		$(MSWDIR)/fontutil.$(OBJSUFF) \
 		$(MSWDIR)/frame.$(OBJSUFF) \
 		$(MSWDIR)/gauge95.$(OBJSUFF) \
 		$(MSWDIR)/gdiobj.$(OBJSUFF) \
@@ -362,38 +369,46 @@ XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
 		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(ADVANCEDOBJS) # $(XPMOBJECTS)
+#OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS)  
 
 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
   else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
   endif
 else
-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
 endif
 
-all:    $(OBJECTS) $(WXLIB)
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
 	ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
 	$(RANLIB) $@
 
+$(ZLIBLIB): $(ZLIBOBJS)
+	ar $(AROPTIONS) $@ $(ZLIBOBJS)
+	$(RANLIB) $@
+
+$(PNGLIB): $(PNGOBJS)
+	ar $(AROPTIONS) $@ $(PNGOBJS)
+	$(RANLIB) $@
+
+$(JPEGLIB): $(JPEGOBJS)
+	ar $(AROPTIONS) $@ $(JPEGOBJS)
+	$(RANLIB) $@
+
 $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
-	copy ..\common\dosyacc.c ..\common\y_tab.c
+	$(COPY) ..\\common\\dosyacc.c ..\\common\\y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-	copy ..\common\doslex.c ..\common\lex_yy.c
+	$(COPY) ..\\common\\doslex.c ..\\common\\lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
@@ -427,20 +442,21 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 
 clean:
 	-$(RM) *.o
+	-$(RM) ole/*.o
 	-$(RM) *.bak
 	-$(RM) core
-	-$(RM) ..\common\y_tab.c
-	-$(RM) ..\common\lex_yy.c
-	-$(RM) ..\common\*.o
-	-$(RM) ..\common\*.bak
-	-$(RM) ..\generic\*.o
-	-$(RM) ..\generic\*.bak
-	-$(RM) ..\html\*.o
-	-$(RM) ..\png\*.o
-	-$(RM) ..\png\*.bak
-	-$(RM) ..\zlib\*.o
-	-$(RM) ..\zlib\*.bak
-	-$(RM) ..\jpeg\*.o
-	-$(RM) ..\..\lib\libwx.a
+	-$(RM) ../common/y_tab.c
+	-$(RM) ../common/lex_yy.c
+	-$(RM) ../common/*.o
+	-$(RM) ../common/*.bak
+	-$(RM) ../generic/*.o
+	-$(RM) ../generic/*.bak
+	-$(RM) ../html/*.o
+	-$(RM) ../png/*.o
+	-$(RM) ../png/*.bak
+	-$(RM) ../zlib/*.o
+	-$(RM) ../zlib/*.bak
+	-$(RM) ../jpeg/*.o
+	-$(RM) ../../lib/libwx.a
 
 cleanall: clean