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

Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-06 20:32:05 +00:00
parent 907173e51d
commit 958d3a7e4b
6 changed files with 97 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/checklst/checklst.cpp
View File

@@ -48,7 +48,7 @@ public:
// ctor & dtor // ctor & dtor
CheckListBoxFrame(wxFrame *frame, const wxChar *title, CheckListBoxFrame(wxFrame *frame, const wxChar *title,
int x, int y, int w, int h); int x, int y, int w, int h);
virtual ~CheckListBoxFrame(); virtual ~CheckListBoxFrame(){};
// notifications // notifications
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
@@ -243,10 +243,6 @@ void CheckListBoxFrame::CreateCheckListbox(long flags)
m_pListBox->Select(3); m_pListBox->Select(3);
} }
CheckListBoxFrame::~CheckListBoxFrame()
{
}
void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{ {
Close(true); Close(true);

20
samples/dnd/dnd.cpp
View File

@@ -345,10 +345,10 @@ protected:
struct ShapeDump struct ShapeDump
{ {
int x, y, // position wxCoord x, y, // position
w, h, // size w, h; // size
r, g, b, // colour int k; // kind
k; // kind unsigned char r, g, b; // colour
}; };
wxPoint m_pos; wxPoint m_pos;
@@ -747,16 +747,16 @@ public:
// override base class (pure) virtuals // override base class (pure) virtuals
virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)
{ {
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
m_frame->SetStatusText(_T("Mouse entered the frame")); m_frame->SetStatusText(_T("Mouse entered the frame"));
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
return OnDragOver(x, y, def); return OnDragOver(x, y, def);
} }
virtual void OnLeave() virtual void OnLeave()
{ {
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
m_frame->SetStatusText(_T("Mouse left the frame")); m_frame->SetStatusText(_T("Mouse left the frame"));
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
} }
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
@@ -1645,7 +1645,7 @@ void DnDShapeDialog::OnColour(wxCommandEvent& WXUNUSED(event))
data.SetChooseFull(true); data.SetChooseFull(true);
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
wxColour colour(i*16, i*16, i*16); wxColour colour((unsigned char)(i*16), (unsigned char)(i*16), (unsigned char)(i*16));
data.SetCustomColour(i, colour); data.SetCustomColour(i, colour);
} }

102
samples/docview/doc.cpp
View File

@@ -36,10 +36,6 @@
#include "view.h" #include "view.h"
IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
DrawingDocument::DrawingDocument(void)
{
}
DrawingDocument::~DrawingDocument(void) DrawingDocument::~DrawingDocument(void)
{ {
WX_CLEAR_LIST(wxList, doodleSegments); WX_CLEAR_LIST(wxList, doodleSegments);
@@ -49,42 +45,42 @@ DrawingDocument::~DrawingDocument(void)
wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream) wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{ {
wxDocument::SaveObject(stream); wxDocument::SaveObject(stream);
wxInt32 n = doodleSegments.GetCount(); wxInt32 n = doodleSegments.GetCount();
stream << n << '\n'; stream << n << '\n';
wxList::compatibility_iterator node = doodleSegments.GetFirst(); wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node) while (node)
{ {
DoodleSegment *segment = (DoodleSegment *)node->GetData(); DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream); segment->SaveObject(stream);
stream << '\n'; stream << '\n';
node = node->GetNext(); node = node->GetNext();
} }
return stream; return stream;
} }
#else #else
wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream) wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
{ {
wxDocument::SaveObject(stream); wxDocument::SaveObject(stream);
wxTextOutputStream text_stream( stream ); wxTextOutputStream text_stream( stream );
wxInt32 n = doodleSegments.GetCount(); wxInt32 n = doodleSegments.GetCount();
text_stream << n << '\n'; text_stream << n << '\n';
wxList::compatibility_iterator node = doodleSegments.GetFirst(); wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node) while (node)
{ {
DoodleSegment *segment = (DoodleSegment *)node->GetData(); DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream); segment->SaveObject(stream);
text_stream << '\n'; text_stream << '\n';
node = node->GetNext(); node = node->GetNext();
} }
return stream; return stream;
} }
#endif #endif
@@ -93,44 +89,40 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream) wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
{ {
wxDocument::LoadObject(stream); wxDocument::LoadObject(stream);
wxInt32 n = 0; wxInt32 n = 0;
stream >> n; stream >> n;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
DoodleSegment *segment = new DoodleSegment; DoodleSegment *segment = new DoodleSegment;
segment->LoadObject(stream); segment->LoadObject(stream);
doodleSegments.Append(segment); doodleSegments.Append(segment);
} }
return stream; return stream;
} }
#else #else
wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream) wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
{ {
wxDocument::LoadObject(stream); wxDocument::LoadObject(stream);
wxTextInputStream text_stream( stream ); wxTextInputStream text_stream( stream );
wxInt32 n = 0; wxInt32 n = 0;
text_stream >> n; text_stream >> n;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
DoodleSegment *segment = new DoodleSegment; DoodleSegment *segment = new DoodleSegment;
segment->LoadObject(stream); segment->LoadObject(stream);
doodleSegments.Append(segment); doodleSegments.Append(segment);
} }
return stream; return stream;
} }
#endif #endif
DoodleSegment::DoodleSegment(void)
{
}
DoodleSegment::DoodleSegment(DoodleSegment& seg) DoodleSegment::DoodleSegment(DoodleSegment& seg)
{ {
wxList::compatibility_iterator node = seg.lines.GetFirst(); wxList::compatibility_iterator node = seg.lines.GetFirst();
@@ -142,9 +134,9 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
newLine->y1 = line->y1; newLine->y1 = line->y1;
newLine->x2 = line->x2; newLine->x2 = line->x2;
newLine->y2 = line->y2; newLine->y2 = line->y2;
lines.Append(newLine); lines.Append(newLine);
node = node->GetNext(); node = node->GetNext();
} }
} }
@@ -159,39 +151,39 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{ {
wxInt32 n = lines.GetCount(); wxInt32 n = lines.GetCount();
stream << n << '\n'; stream << n << '\n';
wxList::compatibility_iterator node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
stream << line->x1 << " " << stream << line->x1 << " " <<
line->y1 << " " << line->y1 << " " <<
line->x2 << " " << line->x2 << " " <<
line->y2 << "\n"; line->y2 << "\n";
node = node->GetNext(); node = node->GetNext();
} }
return stream; return stream;
} }
#else #else
wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream) wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
{ {
wxTextOutputStream text_stream( stream ); wxTextOutputStream text_stream( stream );
wxInt32 n = lines.GetCount(); wxInt32 n = lines.GetCount();
text_stream << n << _T('\n'); text_stream << n << _T('\n');
wxList::compatibility_iterator node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
text_stream << line->x1 << _T(" ") << text_stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") << line->y1 << _T(" ") <<
line->x2 << _T(" ") << line->x2 << _T(" ") <<
line->y2 << _T("\n"); line->y2 << _T("\n");
node = node->GetNext(); node = node->GetNext();
} }
return stream; return stream;
} }
#endif #endif
@@ -201,37 +193,37 @@ wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
{ {
wxInt32 n = 0; wxInt32 n = 0;
stream >> n; stream >> n;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
DoodleLine *line = new DoodleLine; DoodleLine *line = new DoodleLine;
stream >> line->x1 >> stream >> line->x1 >>
line->y1 >> line->y1 >>
line->x2 >> line->x2 >>
line->y2; line->y2;
lines.Append(line); lines.Append(line);
} }
return stream; return stream;
} }
#else #else
wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream) wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
{ {
wxTextInputStream text_stream( stream ); wxTextInputStream text_stream( stream );
wxInt32 n = 0; wxInt32 n = 0;
text_stream >> n; text_stream >> n;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
DoodleLine *line = new DoodleLine; DoodleLine *line = new DoodleLine;
text_stream >> line->x1 >> text_stream >> line->x1 >>
line->y1 >> line->y1 >>
line->x2 >> line->x2 >>
line->y2; line->y2;
lines.Append(line); lines.Append(line);
} }
return stream; return stream;
} }
#endif #endif
@@ -277,10 +269,10 @@ bool DrawingCommand::Do(void)
wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast(); wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
if (segment) if (segment)
delete segment; delete segment;
segment = (DoodleSegment *)node->GetData(); segment = (DoodleSegment *)node->GetData();
doc->GetDoodleSegments().Erase(node); doc->GetDoodleSegments().Erase(node);
doc->Modify(true); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
} }
@@ -324,7 +316,7 @@ bool DrawingCommand::Undo(void)
DoodleSegment *seg = (DoodleSegment *)node->GetData(); DoodleSegment *seg = (DoodleSegment *)node->GetData();
delete seg; delete seg;
doc->GetDoodleSegments().Erase(node); doc->GetDoodleSegments().Erase(node);
doc->Modify(true); doc->Modify(true);
doc->UpdateAllViews(); doc->UpdateAllViews();
} }
@@ -340,7 +332,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
bool TextEditDocument::OnSaveDocument(const wxString& filename) bool TextEditDocument::OnSaveDocument(const wxString& filename)
{ {
TextEditView *view = (TextEditView *)GetFirstView(); TextEditView *view = (TextEditView *)GetFirstView();
if (!view->textsw->SaveFile(filename)) if (!view->textsw->SaveFile(filename))
return false; return false;
Modify(false); Modify(false);
@@ -356,7 +348,7 @@ bool TextEditDocument::OnOpenDocument(const wxString& filename)
TextEditView *view = (TextEditView *)GetFirstView(); TextEditView *view = (TextEditView *)GetFirstView();
if (!view->textsw->LoadFile(filename)) if (!view->textsw->LoadFile(filename))
return false; return false;
SetFilename(filename, true); SetFilename(filename, true);
Modify(false); Modify(false);
UpdateAllViews(); UpdateAllViews();
@@ -377,9 +369,9 @@ bool TextEditDocument::IsModified(void) const
void TextEditDocument::Modify(bool mod) void TextEditDocument::Modify(bool mod)
{ {
TextEditView *view = (TextEditView *)GetFirstView(); TextEditView *view = (TextEditView *)GetFirstView();
wxDocument::Modify(mod); wxDocument::Modify(mod);
if (!mod && view && view->textsw) if (!mod && view && view->textsw)
view->textsw->DiscardEdits(); view->textsw->DiscardEdits();
} }

20
samples/docview/doc.h
View File

@@ -34,11 +34,11 @@ class DoodleSegment: public wxObject
{ {
public: public:
wxList lines; wxList lines;
DoodleSegment(void); DoodleSegment(void){};
DoodleSegment(DoodleSegment& seg); DoodleSegment(DoodleSegment& seg);
~DoodleSegment(void); ~DoodleSegment(void);
void Draw(wxDC *dc); void Draw(wxDC *dc);
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
wxSTD ostream& SaveObject(wxSTD ostream& text_stream); wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
@@ -47,7 +47,7 @@ public:
wxOutputStream& SaveObject(wxOutputStream& stream); wxOutputStream& SaveObject(wxOutputStream& stream);
wxInputStream& LoadObject(wxInputStream& stream); wxInputStream& LoadObject(wxInputStream& stream);
#endif #endif
}; };
class DrawingDocument: public wxDocument class DrawingDocument: public wxDocument
@@ -56,10 +56,10 @@ class DrawingDocument: public wxDocument
private: private:
public: public:
wxList doodleSegments; wxList doodleSegments;
DrawingDocument(void); DrawingDocument(void){};
~DrawingDocument(void); ~DrawingDocument(void);
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
wxSTD ostream& SaveObject(wxSTD ostream& text_stream); wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
wxSTD istream& LoadObject(wxSTD istream& text_stream); wxSTD istream& LoadObject(wxSTD istream& text_stream);
@@ -67,7 +67,7 @@ public:
wxOutputStream& SaveObject(wxOutputStream& stream); wxOutputStream& SaveObject(wxOutputStream& stream);
wxInputStream& LoadObject(wxInputStream& stream); wxInputStream& LoadObject(wxInputStream& stream);
#endif #endif
inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; }; inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
}; };
@@ -83,7 +83,7 @@ protected:
public: public:
DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg); DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
~DrawingCommand(void); ~DrawingCommand(void);
bool Do(void); bool Do(void);
bool Undo(void); bool Undo(void);
}; };
@@ -101,7 +101,7 @@ wxSTD istream& LoadObject(wxSTD istream& stream);
virtual bool OnOpenDocument(const wxString& filename); virtual bool OnOpenDocument(const wxString& filename);
virtual bool IsModified(void) const; virtual bool IsModified(void) const;
virtual void Modify(bool mod); virtual void Modify(bool mod);
TextEditDocument(void) {} TextEditDocument(void) {}
~TextEditDocument(void) {} ~TextEditDocument(void) {}
}; };

57
samples/docvwmdi/doc.cpp
View File

@@ -34,10 +34,6 @@
IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
DrawingDocument::DrawingDocument(void)
{
}
DrawingDocument::~DrawingDocument(void) DrawingDocument::~DrawingDocument(void)
{ {
WX_CLEAR_LIST(wxList, doodleSegments); WX_CLEAR_LIST(wxList, doodleSegments);
@@ -47,20 +43,20 @@ DrawingDocument::~DrawingDocument(void)
wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream) wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{ {
wxDocument::SaveObject(stream); wxDocument::SaveObject(stream);
wxInt32 n = doodleSegments.GetCount(); wxInt32 n = doodleSegments.GetCount();
stream << n << _T('\n'); stream << n << _T('\n');
wxList::compatibility_iterator node = doodleSegments.GetFirst(); wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node) while (node)
{ {
DoodleSegment *segment = (DoodleSegment *)node->GetData(); DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream); segment->SaveObject(stream);
stream << _T('\n'); stream << _T('\n');
node = node->GetNext(); node = node->GetNext();
} }
return stream; return stream;
} }
#else #else
@@ -72,17 +68,17 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxInt32 n = doodleSegments.GetCount(); wxInt32 n = doodleSegments.GetCount();
text_stream << n << _T('\n'); text_stream << n << _T('\n');
wxList::compatibility_iterator node = doodleSegments.GetFirst(); wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node) while (node)
{ {
DoodleSegment *segment = (DoodleSegment *)node->GetData(); DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream); segment->SaveObject(stream);
text_stream << _T('\n'); text_stream << _T('\n');
node = node->GetNext(); node = node->GetNext();
} }
return stream; return stream;
} }
#endif #endif
@@ -91,7 +87,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream) wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
{ {
wxDocument::LoadObject(stream); wxDocument::LoadObject(stream);
wxInt32 n = 0; wxInt32 n = 0;
stream >> n; stream >> n;
@@ -124,9 +120,6 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
return stream; return stream;
} }
#endif #endif
DoodleSegment::DoodleSegment(void)
{
}
DoodleSegment::DoodleSegment(DoodleSegment& seg) DoodleSegment::DoodleSegment(DoodleSegment& seg)
{ {
@@ -156,14 +149,14 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{ {
wxInt32 n = lines.GetCount(); wxInt32 n = lines.GetCount();
stream << n << _T('\n'); stream << n << _T('\n');
wxList::compatibility_iterator node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
stream << line->x1 << _T(" ") << stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") << line->y1 << _T(" ") <<
line->x2 << _T(" ") << line->x2 << _T(" ") <<
line->y2 << _T("\n"); line->y2 << _T("\n");
node = node->GetNext(); node = node->GetNext();
} }
@@ -177,14 +170,14 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
wxInt32 n = lines.GetCount(); wxInt32 n = lines.GetCount();
text_stream << n << _T('\n'); text_stream << n << _T('\n');
wxList::compatibility_iterator node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
text_stream << line->x1 << _T(" ") << text_stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") << line->y1 << _T(" ") <<
line->x2 << _T(" ") << line->x2 << _T(" ") <<
line->y2 << _T("\n"); line->y2 << _T("\n");
node = node->GetNext(); node = node->GetNext();
} }
@@ -202,13 +195,13 @@ wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
DoodleLine *line = new DoodleLine; DoodleLine *line = new DoodleLine;
stream >> line->x1 >> stream >> line->x1 >>
line->y1 >> line->y1 >>
line->x2 >> line->x2 >>
line->y2; line->y2;
lines.Append(line); lines.Append(line);
} }
return stream; return stream;
} }
#else #else
@@ -222,13 +215,13 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
DoodleLine *line = new DoodleLine; DoodleLine *line = new DoodleLine;
text_stream >> line->x1 >> text_stream >> line->x1 >>
line->y1 >> line->y1 >>
line->x2 >> line->x2 >>
line->y2; line->y2;
lines.Append(line); lines.Append(line);
} }
return stream; return stream;
} }
#endif #endif
@@ -273,7 +266,7 @@ bool DrawingCommand::Do(void)
wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast(); wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
if (segment) if (segment)
delete segment; delete segment;
segment = (DoodleSegment *)node->GetData(); segment = (DoodleSegment *)node->GetData();
doc->GetDoodleSegments().Erase(node); doc->GetDoodleSegments().Erase(node);

8
samples/docvwmdi/doc.h
View File

@@ -35,12 +35,12 @@ class DoodleSegment: public wxObject
public: public:
wxList lines; wxList lines;
DoodleSegment(void); DoodleSegment(void){};
DoodleSegment(DoodleSegment& seg); DoodleSegment(DoodleSegment& seg);
~DoodleSegment(void); ~DoodleSegment(void);
void Draw(wxDC *dc); void Draw(wxDC *dc);
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
wxSTD ostream& SaveObject(wxSTD ostream& text_stream); wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
wxSTD istream& LoadObject(wxSTD istream& text_stream); wxSTD istream& LoadObject(wxSTD istream& text_stream);
@@ -56,8 +56,8 @@ class DrawingDocument: public wxDocument
private: private:
public: public:
wxList doodleSegments; wxList doodleSegments;
DrawingDocument(void); DrawingDocument(void){};
~DrawingDocument(void); ~DrawingDocument(void);
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM