BC++ fixes.

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

diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index da2647d432a4de79f98f5ad1a56431ed4b598182..e925941ccfaf1406ae213b1dcf0caaff4569332e 100644 (file)
--- 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 ae1a30c870dbb71f4082626f4fac758aa258420c..1d922a5c7279bc7309db2a54037cad9b1ca16848 100644 (file)
--- 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 13e5d3e4f5a22ea74efe57ee665b63a4b796c4ac..121a5e57be9f881874f82a7716e219a4cdfed090 100644 (file)
--- 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 6a40f0b1d9926938111dabdd65a2b180e8c71a4f..7faeca754c3bf112c6c6026a20fc21441572f993 100644 (file)
--- 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();