Some Borland/GnuWin32 fixes

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 4e81d182ef1afe6504a0f9f687da33ceb3f6a086..1a7f7cfd65ad0460baab59157d19b872e8ac0e13 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -38,10 +38,14 @@ void WXDLLEXPORT wxFillLogFont(LOGFONT *logFont, wxFont *font);
 wxFont WXDLLEXPORT wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE);
 
 #ifdef __GNUWIN32__
-#define CASTWNDPROC (long unsigned)
+#  define CASTWNDPROC (long unsigned)
 #else
-typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
-#define CASTWNDPROC (WndProcCast)
+#  ifdef __BORLANDC__
+#    define CASTWNDPROC
+#  else
+     typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
+#    define CASTWNDPROC (WndProcCast)
+#  endif
 #endif
 
 #if !defined(APIENTRY) // NT defines APIENTRY, 3.x not

diff --git a/src/makeg95.env b/src/makeg95.env
index df75642221ab1d574a75b1c8f324e6b5afa34a26..2a0ace01a58fbe127ba43bd1e0dc884c4baf9e91 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -186,7 +186,7 @@ WXSRC=$(WXDIR)/src/msw
 WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
-INC = -I$(WXINC) $(COMPPATHS)
+INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)$(COMPPATHS)
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 7210398a80a94d8b5c4b4a947342089989b6d7c5..0ac154ea73bc437ee69446a19136ec3e114e5258 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -560,7 +560,7 @@ $(CFG): makefile.b32
 -Oxt
 -WE
 
--I$(WXINC);$(BCCDIR)\include;-I$(WXDIR)/src/png;-I$(WXDIR)/src/zlib
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
 -I$(WXDIR)\include\msw\gnuwin32
 
 -L$(BCCDIR)\lib

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index ccfdcc997a58473d1c236268a2f801d291cebd21..f60b5747257b436dd4e5f0df09f4de06e44529dd 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -171,7 +171,12 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
   wxWindow *win = CreateAbortWindow(parent, printout);
   wxYield();
+
+#if defined(__BORLANDC__) || defined(__GNUWIN32__)
+  ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) lpAbortProc);
+#else
   ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)(HDC, int)) lpAbortProc);
+#endif
 
   if (!win)
   {