-1->wxID_ANY, TRUE->true and FALSE->false replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -50,14 +50,14 @@ TAG_HANDLER_PROC(tag)
|
|||||||
|
|
||||||
if (tag.HasParam(wxT("FLOAT"))) fl = ax;
|
if (tag.HasParam(wxT("FLOAT"))) fl = ax;
|
||||||
|
|
||||||
wnd = new wxTextCtrl(m_WParser->GetWindow(), -1, tag.GetParam(wxT("NAME")),
|
wnd = new wxTextCtrl(m_WParser->GetWindow(), wxID_ANY, tag.GetParam(wxT("NAME")),
|
||||||
wxPoint(0,0), wxSize(ax, ay), wxTE_MULTILINE);
|
wxPoint(0,0), wxSize(ax, ay), wxTE_MULTILINE);
|
||||||
|
|
||||||
wnd->Show(TRUE);
|
wnd->Show(true);
|
||||||
|
|
||||||
m_WParser->GetContainer()->InsertCell(new wxHtmlWidgetCell(wnd, fl));
|
m_WParser->GetContainer()->InsertCell(new wxHtmlWidgetCell(wnd, fl));
|
||||||
|
|
||||||
return FALSE;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TAG_HANDLER_END(MYBIND)
|
TAG_HANDLER_END(MYBIND)
|
||||||
@@ -158,13 +158,13 @@ bool MyApp::OnInit()
|
|||||||
|
|
||||||
// Show it and tell the application that it's our main window
|
// Show it and tell the application that it's our main window
|
||||||
// @@@ what does it do exactly, in fact? is it necessary here?
|
// @@@ what does it do exactly, in fact? is it necessary here?
|
||||||
frame->Show(TRUE);
|
frame->Show(true);
|
||||||
SetTopWindow(frame);
|
SetTopWindow(frame);
|
||||||
|
|
||||||
// success: wxApp::OnRun() will be called which will enter the main message
|
// success: wxApp::OnRun() will be called which will enter the main message
|
||||||
// loop and the application will run. If we returned FALSE here, the
|
// loop and the application will run. If we returned false here, the
|
||||||
// application would exit immediately.
|
// application would exit immediately.
|
||||||
return TRUE;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -175,7 +175,7 @@ wxHtmlWindow *html;
|
|||||||
|
|
||||||
// frame constructor
|
// frame constructor
|
||||||
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||||
: wxFrame((wxFrame *)NULL, -1, title, pos, size)
|
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
|
||||||
{
|
{
|
||||||
// create a menu bar
|
// create a menu bar
|
||||||
wxMenu *menuFile = new wxMenu;
|
wxMenu *menuFile = new wxMenu;
|
||||||
@@ -206,8 +206,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
|||||||
|
|
||||||
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
// TRUE is to force the frame to close
|
// true is to force the frame to close
|
||||||
Close(TRUE);
|
Close(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
|
void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
|
||||||
|
Reference in New Issue
Block a user