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

Split this out from other changes to keep things sane..

Browse Source 
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-13 05:17:41 +00:00
parent 5797172366
commit b1d4dd7add
59 changed files with 1099 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/caret/caret.cpp
View File

@@ -383,7 +383,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
void MyCanvas::OnChar( wxKeyEvent &event )
{
switch ( event.KeyCode() )
switch ( event.GetKeyCode() )
{
case WXK_LEFT:
PrevChar();
@@ -415,9 +415,9 @@ void MyCanvas::OnChar( wxKeyEvent &event )
break;
default:
if ( !event.AltDown() && wxIsprint(event.KeyCode()) )
if ( !event.AltDown() && wxIsprint(event.GetKeyCode()) )
{
wxChar ch = (wxChar)event.KeyCode();
wxChar ch = (wxChar)event.GetKeyCode();
CharAt(m_xCaret, m_yCaret) = ch;
wxCaretSuspend cs(this);

4
samples/controls/controls.cpp
View File

@@ -1690,7 +1690,7 @@ void MyComboBox::OnChar(wxKeyEvent& event)
{
wxLogMessage(_T("MyComboBox::OnChar"));
if ( event.KeyCode() == 'w' )
if ( event.GetKeyCode() == 'w' )
wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
else
event.Skip();
@@ -1700,7 +1700,7 @@ void MyComboBox::OnKeyDown(wxKeyEvent& event)
{
wxLogMessage(_T("MyComboBox::OnKeyDown"));
if ( event.KeyCode() == 'w' )
if ( event.GetKeyCode() == 'w' )
wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
else
event.Skip();

56
samples/docview/doc.cpp
View File

@@ -50,17 +50,17 @@ wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{
wxDocument::SaveObject(stream);
wxInt32 n = doodleSegments.Number();
wxInt32 n = doodleSegments.GetCount();
stream << n << '\n';
wxNode *node = doodleSegments.First();
wxNode *node = doodleSegments.GetFirst();
while (node)
{
DoodleSegment *segment = (DoodleSegment *)node->Data();
DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
stream << '\n';
node = node->Next();
node = node->GetNext();
}
return stream;
@@ -72,17 +72,17 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxTextOutputStream text_stream( stream );
wxInt32 n = doodleSegments.Number();
wxInt32 n = doodleSegments.GetCount();
text_stream << n << '\n';
wxNode *node = doodleSegments.First();
wxNode *node = doodleSegments.GetFirst();
while (node)
{
DoodleSegment *segment = (DoodleSegment *)node->Data();
DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
text_stream << '\n';
node = node->Next();
node = node->GetNext();
}
return stream;
@@ -133,10 +133,10 @@ DoodleSegment::DoodleSegment(void)
DoodleSegment::DoodleSegment(DoodleSegment& seg)
{
wxNode *node = seg.lines.First();
wxNode *node = seg.lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->Data();
DoodleLine *line = (DoodleLine *)node->GetData();
DoodleLine *newLine = new DoodleLine;
newLine->x1 = line->x1;
newLine->y1 = line->y1;
@@ -145,7 +145,7 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
lines.Append(newLine);
node = node->Next();
node = node->GetNext();
}
}
@@ -157,18 +157,18 @@ DoodleSegment::~DoodleSegment(void)
#if wxUSE_STD_IOSTREAM
wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{
wxInt32 n = lines.Number();
wxInt32 n = lines.GetCount();
stream << n << '\n';
wxNode *node = lines.First();
wxNode *node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->Data();
DoodleLine *line = (DoodleLine *)node->GetData();
stream << line->x1 << " " <<
line->y1 << " " <<
line->x2 << " " <<
line->y2 << "\n";
node = node->Next();
node = node->GetNext();
}
return stream;
@@ -178,18 +178,18 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
{
wxTextOutputStream text_stream( stream );
wxInt32 n = lines.Number();
wxInt32 n = lines.GetCount();
text_stream << n << _T('\n');
wxNode *node = lines.First();
wxNode *node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->Data();
DoodleLine *line = (DoodleLine *)node->GetData();
text_stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") <<
line->x2 << _T(" ") <<
line->y2 << _T("\n");
node = node->Next();
node = node->GetNext();
}
return stream;
@@ -238,12 +238,12 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
void DoodleSegment::Draw(wxDC *dc)
{
wxNode *node = lines.First();
wxNode *node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->Data();
DoodleLine *line = (DoodleLine *)node->GetData();
dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
node = node->Next();
node = node->GetNext();
}
}
@@ -272,13 +272,13 @@ bool DrawingCommand::Do(void)
case DOODLE_CUT:
{
// Cut the last segment
if (doc->GetDoodleSegments().Number() > 0)
if (doc->GetDoodleSegments().GetCount() > 0)
{
wxNode *node = doc->GetDoodleSegments().Last();
wxNode *node = doc->GetDoodleSegments().GetLast();
if (segment)
delete segment;
segment = (DoodleSegment *)node->Data();
segment = (DoodleSegment *)node->GetData();
delete node;
doc->Modify(TRUE);
@@ -318,10 +318,10 @@ bool DrawingCommand::Undo(void)
case DOODLE_ADD:
{
// Cut the last segment
if (doc->GetDoodleSegments().Number() > 0)
if (doc->GetDoodleSegments().GetCount() > 0)
{
wxNode *node = doc->GetDoodleSegments().Last();
DoodleSegment *seg = (DoodleSegment *)node->Data();
wxNode *node = doc->GetDoodleSegments().GetLast();
DoodleSegment *seg = (DoodleSegment *)node->GetData();
delete seg;
delete node;

8
samples/docview/view.cpp
View File

@@ -90,12 +90,12 @@ void DrawingView::OnDraw(wxDC *dc)
dc->SetFont(*wxNORMAL_FONT);
dc->SetPen(*wxBLACK_PEN);
wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().First();
wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();
while (node)
{
DoodleSegment *seg = (DoodleSegment *)node->Data();
DoodleSegment *seg = (DoodleSegment *)node->GetData();
seg->Draw(dc);
node = node->Next();
node = node->GetNext();
}
}
@@ -241,7 +241,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
if (currentSegment && event.LeftUp())
{
if (currentSegment->lines.Number() == 0)
if (currentSegment->lines.GetCount() == 0)
{
delete currentSegment;
currentSegment = (DoodleSegment *) NULL;

56
samples/docvwmdi/doc.cpp
View File

@@ -48,17 +48,17 @@ wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{
wxDocument::SaveObject(stream);
wxInt32 n = doodleSegments.Number();
wxInt32 n = doodleSegments.GetCount();
stream << n << _T('\n');
wxNode *node = doodleSegments.First();
wxNode *node = doodleSegments.GetFirst();
while (node)
{
DoodleSegment *segment = (DoodleSegment *)node->Data();
DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
stream << _T('\n');
node = node->Next();
node = node->GetNext();
}
return stream;
@@ -70,17 +70,17 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxTextOutputStream text_stream( stream );
wxInt32 n = doodleSegments.Number();
wxInt32 n = doodleSegments.GetCount();
text_stream << n << _T('\n');
wxNode *node = doodleSegments.First();
wxNode *node = doodleSegments.GetFirst();
while (node)
{
DoodleSegment *segment = (DoodleSegment *)node->Data();
DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
text_stream << _T('\n');
node = node->Next();
node = node->GetNext();
}
return stream;
@@ -130,10 +130,10 @@ DoodleSegment::DoodleSegment(void)
DoodleSegment::DoodleSegment(DoodleSegment& seg)
{
wxNode *node = seg.lines.First();
wxNode *node = seg.lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->Data();
DoodleLine *line = (DoodleLine *)node->GetData();
DoodleLine *newLine = new DoodleLine;
newLine->x1 = line->x1;
newLine->y1 = line->y1;
@@ -142,7 +142,7 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
lines.Append(newLine);
node = node->Next();
node = node->GetNext();
}
}
@@ -154,18 +154,18 @@ DoodleSegment::~DoodleSegment(void)
#if wxUSE_STD_IOSTREAM
wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{
wxInt32 n = lines.Number();
wxInt32 n = lines.GetCount();
stream << n << _T('\n');
wxNode *node = lines.First();
wxNode *node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->Data();
DoodleLine *line = (DoodleLine *)node->GetData();
stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") <<
line->x2 << _T(" ") <<
line->y2 << _T("\n");
node = node->Next();
node = node->GetNext();
}
return stream;
@@ -175,18 +175,18 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
{
wxTextOutputStream text_stream( stream );
wxInt32 n = lines.Number();
wxInt32 n = lines.GetCount();
text_stream << n << _T('\n');
wxNode *node = lines.First();
wxNode *node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->Data();
DoodleLine *line = (DoodleLine *)node->GetData();
text_stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") <<
line->x2 << _T(" ") <<
line->y2 << _T("\n");
node = node->Next();
node = node->GetNext();
}
return stream;
@@ -234,12 +234,12 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
#endif
void DoodleSegment::Draw(wxDC *dc)
{
wxNode *node = lines.First();
wxNode *node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->Data();
DoodleLine *line = (DoodleLine *)node->GetData();
dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
node = node->Next();
node = node->GetNext();
}
}
@@ -268,13 +268,13 @@ bool DrawingCommand::Do(void)
case DOODLE_CUT:
{
// Cut the last segment
if (doc->GetDoodleSegments().Number() > 0)
if (doc->GetDoodleSegments().GetCount() > 0)
{
wxNode *node = doc->GetDoodleSegments().Last();
wxNode *node = doc->GetDoodleSegments().GetLast();
if (segment)
delete segment;
segment = (DoodleSegment *)node->Data();
segment = (DoodleSegment *)node->GetData();
delete node;
doc->Modify(TRUE);
@@ -314,10 +314,10 @@ bool DrawingCommand::Undo(void)
case DOODLE_ADD:
{
// Cut the last segment
if (doc->GetDoodleSegments().Number() > 0)
if (doc->GetDoodleSegments().GetCount() > 0)
{
wxNode *node = doc->GetDoodleSegments().Last();
DoodleSegment *seg = (DoodleSegment *)node->Data();
wxNode *node = doc->GetDoodleSegments().GetLast();
DoodleSegment *seg = (DoodleSegment *)node->GetData();
delete seg;
delete node;

8
samples/docvwmdi/view.cpp
View File

@@ -69,12 +69,12 @@ void DrawingView::OnDraw(wxDC *dc)
dc->SetFont(*wxNORMAL_FONT);
dc->SetPen(*wxBLACK_PEN);
wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().First();
wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();
while (node)
{
DoodleSegment *seg = (DoodleSegment *)node->Data();
DoodleSegment *seg = (DoodleSegment *)node->GetData();
seg->Draw(dc);
node = node->Next();
node = node->GetNext();
}
}
@@ -220,7 +220,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
if (currentSegment && event.LeftUp())
{
if (currentSegment->lines.Number() == 0)
if (currentSegment->lines.GetCount() == 0)
{
delete currentSegment;
currentSegment = (DoodleSegment *) NULL;

18
samples/dragimag/dragimag.cpp
View File

@@ -270,13 +270,13 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
void MyCanvas::DrawShapes(wxDC& dc)
{
wxNode* node = m_displayList.First();
wxNode* node = m_displayList.GetFirst();
while (node)
{
DragShape* shape = (DragShape*) node->Data();
DragShape* shape = (DragShape*) node->GetData();
if (shape->IsShown())
shape->Draw(dc);
node = node->Next();
node = node->GetNext();
}
}
@@ -295,25 +295,25 @@ void MyCanvas::EraseShape(DragShape* shape, wxDC& dc)
void MyCanvas::ClearShapes()
{
wxNode* node = m_displayList.First();
wxNode* node = m_displayList.GetFirst();
while (node)
{
DragShape* shape = (DragShape*) node->Data();
DragShape* shape = (DragShape*) node->GetData();
delete shape;
node = node->Next();
node = node->GetNext();
}
m_displayList.Clear();
}
DragShape* MyCanvas::FindShape(const wxPoint& pt) const
{
wxNode* node = m_displayList.First();
wxNode* node = m_displayList.GetFirst();
while (node)
{
DragShape* shape = (DragShape*) node->Data();
DragShape* shape = (DragShape*) node->GetData();
if (shape->HitTest(pt))
return shape;
node = node->Next();
node = node->GetNext();
}
return (DragShape*) NULL;
}

2
samples/opengl/cube/cube.cpp
View File

@@ -357,7 +357,7 @@ void TestGLCanvas::Action( long code, unsigned long lasttime,
void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
{
long evkey = event.KeyCode();
long evkey = event.GetKeyCode();
if (evkey == 0) return;
if (!m_TimeInitialized)

2
samples/opengl/isosurf/isosurf.cpp
View File

@@ -379,7 +379,7 @@ void TestGLCanvas::OnSize(wxSizeEvent& event)
void TestGLCanvas::OnChar(wxKeyEvent& event)
{
switch(event.KeyCode()) {
switch(event.GetKeyCode()) {
case WXK_ESCAPE:
exit(0);
case WXK_LEFT:

4
samples/text/text.cpp
View File

@@ -424,7 +424,7 @@ bool MyTextCtrl::ms_logFocus = FALSE;
void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
{
wxString key;
long keycode = event.KeyCode();
long keycode = event.GetKeyCode();
{
switch ( keycode )
{
@@ -696,7 +696,7 @@ void MyTextCtrl::OnKeyUp(wxKeyEvent& event)
void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
{
switch ( event.KeyCode() )
switch ( event.GetKeyCode() )
{
case WXK_F1:
// show current position and text length

2
samples/treectrl/treetest.cpp
View File

@@ -854,7 +854,7 @@ TREE_EVENT_HANDLER(OnSelChanging)
void LogKeyEvent(const wxChar *name, const wxKeyEvent& event)
{
wxString key;
long keycode = event.KeyCode();
long keycode = event.GetKeyCode();
{
switch ( keycode )
{