Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BC++ fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-10-22 12:45:04 +00:00
parent c32a8bd4db
commit b0a6c154de
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/latex/wx/wx.hpj
View File

@@ -1,14 +1,14 @@
[OPTIONS] [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 TITLE=wxWindows Manual
CONTENTS=Contents CONTENTS=Contents
COMPRESS=HIGH COMPRESS=HIGH
[FILES] [FILES]
Wx.rtf wx.rtf
[CONFIG] [CONFIG]
CreateButton("Up", "&Up", "JumpId(`Wx.hlp', `Contents')") CreateButton("Up", "&Up", "JumpId(`wx.hlp', `Contents')")
BrowseButtons() BrowseButtons()
[MAP] [MAP]

2
include/wx/dataobj.h
View File

@@ -187,7 +187,7 @@ class WXDLLEXPORT wxDataObjectSimple : public wxDataObject
public: public:
// ctor takes the format we support, but it can also be set later with // ctor takes the format we support, but it can also be set later with
// SetFormat() // SetFormat()
wxDataObjectSimple(const wxDataFormat& format = wxFormatInvalid) wxDataObjectSimple(const wxDataFormat& format = wxDataFormat(wxDF_INVALID))
: m_format(format) : m_format(format)
{ {
} }

2
samples/dnd/dnd.cpp
View File

@@ -626,7 +626,7 @@ BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
END_EVENT_TABLE() END_EVENT_TABLE()
BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog) BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)
EVT_BUTTON(Button_Colour, OnColour) EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)
END_EVENT_TABLE() END_EVENT_TABLE()
// ============================================================================ // ============================================================================

2
src/common/dobjcmn.cpp
View File

@@ -97,7 +97,7 @@ wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
{ {
wxSimpleDataObjectList::Node *node = m_dataObjects.Item( m_preferred ); 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(); wxDataObjectSimple* dataObj = node->GetData();