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

some compilation warnings/errors fixed (still doesn't compile under wxGTK though)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-10-21 12:46:48 +00:00
parent b068c4e8a1
commit 79ec2ce20e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
samples/dnd/dnd.cpp
View File

@ -972,7 +972,7 @@ void DnDFrame::OnPasteBitmap(wxCommandEvent& WXUNUSED(event))
} }
wxBitmapDataObject data; wxBitmapDataObject data;
if ( !wxTheClipboard->GetData(&data) ) if ( !wxTheClipboard->GetData(data) )
{ {
wxLogError(_T("Can't paste bitmap from the clipboard")); wxLogError(_T("Can't paste bitmap from the clipboard"));
} }
@ -1029,7 +1029,7 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
} }
wxTextDataObject text; wxTextDataObject text;
if ( !wxTheClipboard->GetData(&text) ) if ( !wxTheClipboard->GetData(text) )
{ {
wxLogError(_T("Can't paste data from the clipboard")); wxLogError(_T("Can't paste data from the clipboard"));
} }
@ -1305,7 +1305,7 @@ void DnDShapeFrame::OnCopyShape(wxCommandEvent& event)
void DnDShapeFrame::OnPasteShape(wxCommandEvent& event) void DnDShapeFrame::OnPasteShape(wxCommandEvent& event)
{ {
DnDShapeDataObject shapeDataObject(NULL); DnDShapeDataObject shapeDataObject(NULL);
if ( wxTheClipboard->GetData(&shapeDataObject) ) if ( wxTheClipboard->GetData(shapeDataObject) )
{ {
SetShape(shapeDataObject.GetShape()); SetShape(shapeDataObject.GetShape());
} }
@ -1328,9 +1328,15 @@ void DnDShapeFrame::OnUpdateUIPaste(wxUpdateUIEvent& event)
void DnDShapeFrame::OnPaint(wxPaintEvent& event) void DnDShapeFrame::OnPaint(wxPaintEvent& event)
{ {
if ( m_shape ) if ( m_shape )
m_shape->Draw(wxPaintDC(this)); {
wxPaintDC dc(this);
m_shape->Draw(dc);
}
else else
{
event.Skip(); event.Skip();
}
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------