AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-1->wxID_ANY, TRUE->true and FALSE->false replacements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2004-05-20 17:23:15 +00:00
parent 9da8feef23
commit 9013f51341
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
samples/treectrl/treetest.cpp
View File

@ -155,16 +155,16 @@ bool MyApp::OnInit()
MyFrame *frame = new MyFrame(wxT("wxTreeCtrl Test"), 50, 50, 450, 600);
// Show the frame
frame->Show(TRUE);
frame->Show(true);
SetTopWindow(frame);
return TRUE;
return true;
}
// My frame constructor
MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
: wxFrame((wxFrame *)NULL, -1, title, wxPoint(x, y), wxSize(w, h)),
: wxFrame((wxFrame *)NULL, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)),
m_treeCtrl(NULL), m_textCtrl(NULL)
{
// This reduces flicker effects - even better would be to define
@ -186,20 +186,20 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
file_menu->AppendSeparator();
file_menu->Append(TreeTest_Quit, wxT("E&xit\tAlt-X"));
style_menu->Append(TreeTest_TogButtons, wxT("Toggle &normal buttons"), wxT(""), TRUE);
style_menu->Append(TreeTest_TogTwist, wxT("Toggle &twister buttons"), wxT(""), TRUE);
style_menu->Append(TreeTest_ToggleButtons, wxT("Toggle image &buttons"), wxT(""), TRUE);
style_menu->Append(TreeTest_TogButtons, wxT("Toggle &normal buttons"), wxT(""), true);
style_menu->Append(TreeTest_TogTwist, wxT("Toggle &twister buttons"), wxT(""), true);
style_menu->Append(TreeTest_ToggleButtons, wxT("Toggle image &buttons"), wxT(""), true);
style_menu->AppendSeparator();
style_menu->Append(TreeTest_TogLines, wxT("Toggle &connecting lines"), wxT(""), TRUE);
style_menu->Append(TreeTest_TogRootLines, wxT("Toggle &lines at root"), wxT(""), TRUE);
style_menu->Append(TreeTest_TogHideRoot, wxT("Toggle &hidden root"), wxT(""), TRUE);
style_menu->Append(TreeTest_TogBorder, wxT("Toggle &item border"), wxT(""), TRUE);
style_menu->Append(TreeTest_TogFullHighlight, wxT("Toggle &full row highlight"), wxT(""), TRUE);
style_menu->Append(TreeTest_TogEdit, wxT("Toggle &edit mode"), wxT(""), TRUE);
style_menu->Append(TreeTest_TogLines, wxT("Toggle &connecting lines"), wxT(""), true);
style_menu->Append(TreeTest_TogRootLines, wxT("Toggle &lines at root"), wxT(""), true);
style_menu->Append(TreeTest_TogHideRoot, wxT("Toggle &hidden root"), wxT(""), true);
style_menu->Append(TreeTest_TogBorder, wxT("Toggle &item border"), wxT(""), true);
style_menu->Append(TreeTest_TogFullHighlight, wxT("Toggle &full row highlight"), wxT(""), true);
style_menu->Append(TreeTest_TogEdit, wxT("Toggle &edit mode"), wxT(""), true);
#ifndef NO_MULTIPLE_SELECTION
style_menu->Append(TreeTest_ToggleSel, wxT("Toggle &selection mode"), wxT(""), TRUE);
style_menu->Append(TreeTest_ToggleSel, wxT("Toggle &selection mode"), wxT(""), true);
#endif // NO_MULTIPLE_SELECTION
style_menu->Append(TreeTest_ToggleImages, wxT("Toggle show ima&ges"), wxT(""), TRUE);
style_menu->Append(TreeTest_ToggleImages, wxT("Toggle show ima&ges"), wxT(""), true);
style_menu->Append(TreeTest_SetImageSize, wxT("Set image si&ze..."));
style_menu->AppendSeparator();
style_menu->Append(TreeTest_SetFgColour, wxT("Set &foreground colour..."));
@ -256,13 +256,13 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
#endif // wxUSE_MENUS
// create the controls
m_textCtrl = new wxTextCtrl(this, -1, wxT(""),
m_textCtrl = new wxTextCtrl(this, wxID_ANY, wxT(""),
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxSUNKEN_BORDER);
CreateTreeWithDefStyle();
menu_bar->Check(TreeTest_ToggleImages, TRUE);
menu_bar->Check(TreeTest_ToggleImages, true);
#if wxUSE_STATUSBAR
// create a status bar
@ -371,7 +371,7 @@ void MyFrame::Resize()
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
Close(TRUE);
Close(true);
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@ -409,7 +409,7 @@ void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event))
CHECK_ITEM( item );
int i = m_treeCtrl->GetChildrenCount( item, FALSE );
int i = m_treeCtrl->GetChildrenCount( item, false );
wxLogMessage(wxT("%d children"), i);
}
@ -528,7 +528,7 @@ void MyFrame::OnSetImageSize(wxCommandEvent& WXUNUSED(event))
return;
m_treeCtrl->CreateImageList(size);
wxGetApp().SetShowImages(TRUE);
wxGetApp().SetShowImages(true);
}
void MyFrame::OnToggleImages(wxCommandEvent& WXUNUSED(event))
@ -536,12 +536,12 @@ void MyFrame::OnToggleImages(wxCommandEvent& WXUNUSED(event))
if ( wxGetApp().ShowImages() )
{
m_treeCtrl->CreateImageList(-1);
wxGetApp().SetShowImages(FALSE);
wxGetApp().SetShowImages(false);
}
else
{
m_treeCtrl->CreateImageList(0);
wxGetApp().SetShowImages(TRUE);
wxGetApp().SetShowImages(true);
}
}
@ -551,12 +551,12 @@ void MyFrame::OnToggleButtons(wxCommandEvent& WXUNUSED(event))
if ( wxGetApp().ShowButtons() )
{
m_treeCtrl->CreateButtonsImageList(-1);
wxGetApp().SetShowButtons(FALSE);
wxGetApp().SetShowButtons(false);
}
else
{
m_treeCtrl->CreateButtonsImageList(15);
wxGetApp().SetShowButtons(TRUE);
wxGetApp().SetShowButtons(true);
}
#endif
}
@ -652,7 +652,7 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id,
long style)
: wxTreeCtrl(parent, id, pos, size, style)
{
m_reverseSort = FALSE;
m_reverseSort = false;
CreateImageList();
@ -673,7 +673,7 @@ void MyTreeCtrl::CreateImageList(int size)
m_imageSize = size;
// Make an image list containing small icons
wxImageList *images = new wxImageList(size, size, TRUE);
wxImageList *images = new wxImageList(size, size, true);
// should correspond to TreeCtrlIcon_xxx enum
wxBusyCursor wait;
@ -710,7 +710,7 @@ void MyTreeCtrl::CreateButtonsImageList(int size)
}
// Make an image list containing small icons
wxImageList *images = new wxImageList(size, size, TRUE);
wxImageList *images = new wxImageList(size, size, true);
// should correspond to TreeCtrlIcon_xxx enum
wxBusyCursor wait;
@ -1218,5 +1218,5 @@ void MyTreeItemData::ShowInfo(wxTreeCtrl *tree)
Bool2String(tree->IsExpanded(GetId())),
Bool2String(tree->IsBold(GetId())),
tree->GetChildrenCount(GetId()),
tree->GetChildrenCount(GetId(), FALSE));
tree->GetChildrenCount(GetId(), false));
}

14
samples/treectrl/treetest.h
View File

@ -23,7 +23,7 @@
class MyApp : public wxApp
{
public:
MyApp() { m_showImages = TRUE; m_showButtons = FALSE; }
MyApp() { m_showImages = true; m_showButtons = false; }
bool OnInit();
@ -96,7 +96,7 @@ public:
void AddTestItemsToTree(size_t numChildren, size_t depth);
void DoSortChildren(const wxTreeItemId& item, bool reverse = FALSE)
void DoSortChildren(const wxTreeItemId& item, bool reverse = false)
{ m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }
void DoEnsureVisible() { if (m_lastItem.IsOk()) EnsureVisible(m_lastItem); }
@ -190,8 +190,8 @@ public:
void OnSetImageSize(wxCommandEvent& event);
void OnCollapseAndReset(wxCommandEvent& event);
void OnSetBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(TRUE); }
void OnClearBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(FALSE); }
void OnSetBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(true); }
void OnClearBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(false); }
void OnEnsureVisible(wxCommandEvent& event);
@ -200,7 +200,7 @@ public:
void OnRename(wxCommandEvent& event);
void OnSort(wxCommandEvent& WXUNUSED(event)) { DoSort(); }
void OnSortRev(wxCommandEvent& WXUNUSED(event)) { DoSort(TRUE); }
void OnSortRev(wxCommandEvent& WXUNUSED(event)) { DoSort(true); }
void OnAddItem(wxCommandEvent& event);
void OnInsertItem(wxCommandEvent& event);
@ -219,7 +219,7 @@ public:
private:
void TogStyle(int id, long flag);
void DoSort(bool reverse = FALSE);
void DoSort(bool reverse = false);
void Resize();
@ -229,7 +229,7 @@ private:
MyTreeCtrl *m_treeCtrl;
wxTextCtrl *m_textCtrl;
void DoSetBold(bool bold = TRUE);
void DoSetBold(bool bold = true);
DECLARE_EVENT_TABLE()
};