From 2d996ed1c44a591c610e51d58d0bf9f802fac165 Mon Sep 17 00:00:00 2001 From: "J. Russell Smyth" Date: Tue, 14 Sep 1999 20:57:06 +0000 Subject: [PATCH] Mingw32/gcc-2.95 change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dirdlg.h | 2 +- include/wx/msw/colour.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 3f23e13047..7298d81612 100644 --- a/include/wx/dirdlg.h +++ b/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(__SALFORDC__) +#if defined(__WIN16__) || (defined(__GNUWIN32__)&&!defined(wxUSE_NORLANDER_HEADERS)) || defined(__SALFORDC__) #include "wx/generic/dirdlgg.h" #else #include "wx/msw/dirdlg.h" diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 0c3def2984..2cf5908c8b 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -15,6 +15,7 @@ #ifdef __GNUG__ #pragma interface "colour.h" #endif +#include "wx/object.h" // Colour class WXDLLEXPORT wxColour: public wxObject -- 2.45.2