From b0a6c154dec4a98e0a232196fd2b9ad1b02b6199 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 22 Oct 1999 12:45:04 +0000
Subject: [PATCH] BC++ fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/wx.hpj   | 6 +++---
 include/wx/dataobj.h   | 2 +-
 samples/dnd/dnd.cpp    | 2 +-
 src/common/dobjcmn.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index da2647d432..e925941ccf 100644
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,14 +1,14 @@
 [OPTIONS]
-BMROOT=. ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxWind~1\docs\latex\wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
 
 [FILES]
-Wx.rtf
+wx.rtf
 
 [CONFIG]
-CreateButton("Up", "&Up", "JumpId(`Wx.hlp', `Contents')")
+CreateButton("Up", "&Up", "JumpId(`wx.hlp', `Contents')")
 BrowseButtons()
 
 [MAP]
diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index ae1a30c870..1d922a5c72 100644
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -187,7 +187,7 @@ class WXDLLEXPORT wxDataObjectSimple : public wxDataObject
 public:
     // ctor takes the format we support, but it can also be set later with
     // SetFormat()
-    wxDataObjectSimple(const wxDataFormat& format = wxFormatInvalid)
+    wxDataObjectSimple(const wxDataFormat& format = wxDataFormat(wxDF_INVALID))
         : m_format(format)
         {
         }
diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 13e5d3e4f5..121a5e57be 100644
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -626,7 +626,7 @@ BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)
-    EVT_BUTTON(Button_Colour, OnColour)
+    EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)
 END_EVENT_TABLE()
 
 // ============================================================================
diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 6a40f0b1d9..7faeca754c 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -97,7 +97,7 @@ wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
 {
     wxSimpleDataObjectList::Node *node = m_dataObjects.Item( m_preferred );
 
-    wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") );
+    wxCHECK_MSG( node, wxDataFormat((unsigned short) wxDF_INVALID), wxT("no preferred format") );
 
     wxDataObjectSimple* dataObj = node->GetData();
 
-- 
2.45.2