AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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
CheckListBoxFrame(wxFrame *frame, const wxChar *title,
int x, int y, int w, int h);
virtual ~CheckListBoxFrame();
virtual ~CheckListBoxFrame(){};
// notifications
void OnQuit(wxCommandEvent& event);
@ -243,10 +243,6 @@ void CheckListBoxFrame::CreateCheckListbox(long flags)
m_pListBox->Select(3);
}
CheckListBoxFrame::~CheckListBoxFrame()
{
}
void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
Close(true);

20
samples/dnd/dnd.cpp
View File

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

102
samples/docview/doc.cpp
View File

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

20
samples/docview/doc.h
View File

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

57
samples/docvwmdi/doc.cpp
View File

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

8
samples/docvwmdi/doc.h
View File

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