/////////////////////////////////////////////////////////////////////////////
// Name: tree.cpp
-// Purpose: Minimal wxWindows sample
+// Purpose: Minimal wxWidgets sample
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
#endif
// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
// resources
// ----------------------------------------------------------------------------
// the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "mondrian.xpm"
#endif
// ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
// ----------------------------------------------------------------------------
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE()
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
bool MyApp::OnInit()
{
// create the main application window
- MyFrame *frame = new MyFrame("Tree Testing",
+ MyFrame *frame = new MyFrame(wxT("Tree Testing"),
wxPoint(50, 50), wxSize(450, 340));
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
- frame->Show(TRUE);
+ frame->Show(true);
// 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.
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
: wxFrame((wxFrame *)NULL, idMAIN_FRAME, title, pos, size)
{
m_splitter = NULL;
- m_scrolledWindow = NULL;
+ m_scrolledWindow = NULL;
m_tree = NULL;
m_valueWindow = NULL;
#ifdef __WXMAC__
#endif
m_scrolledWindow = new wxSplitterScrolledWindow(this, idSCROLLED_WINDOW, wxDefaultPosition,
- wxDefaultSize, wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL);
+ wxSize(300, 400), wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL);
m_splitter = new wxThinSplitterWindow(m_scrolledWindow, idSPLITTER_WINDOW, wxDefaultPosition,
- wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN /* | wxSP_LIVE_UPDATE */);
- m_splitter->SetSashSize(2);
+ wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN /* | wxSP_LIVE_UPDATE */);
+ m_splitter->SetSashSize(2);
- /* Note the wxTR_ROW_LINES style: draws horizontal lines between items */
+ /* Note the wxTR_ROW_LINES style: draws horizontal lines between items */
m_tree = new TestTree(m_splitter , idTREE_CTRL, wxDefaultPosition,
- wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES );
+ wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES );
m_valueWindow = new TestValueWindow(m_splitter, idVALUE_WINDOW, wxDefaultPosition,
- wxDefaultSize, wxNO_BORDER);
+ wxDefaultSize, wxNO_BORDER);
m_splitter->SplitVertically(m_tree, m_valueWindow);
- //m_splitter->AdjustScrollbars();
- m_splitter->SetSashPosition(200);
- m_scrolledWindow->SetTargetWindow(m_tree);
+ //m_splitter->AdjustScrollbars();
+ m_splitter->SetSashPosition(200);
+ m_scrolledWindow->SetTargetWindow(m_tree);
- m_scrolledWindow->EnableScrolling(FALSE, FALSE);
+ m_scrolledWindow->EnableScrolling(false, false);
- // Let the two controls know about each other
- m_valueWindow->SetTreeCtrl(m_tree);
- m_tree->SetCompanionWindow(m_valueWindow);
+ // Let the two controls know about each other
+ m_valueWindow->SetTreeCtrl(m_tree);
+ m_tree->SetCompanionWindow(m_valueWindow);
// set the frame icon
SetIcon(wxICON(mondrian));
// create a menu bar
- wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+ wxMenu *menuFile = new wxMenu(wxT(""), wxMENU_TEAROFF);
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
+ helpMenu->Append(Minimal_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
- menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");
+ menuFile->Append(Minimal_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(menuFile, "&File");
- menuBar->Append(helpMenu, "&Help");
+ menuBar->Append(menuFile, wxT("&File"));
+ menuBar->Append(helpMenu, wxT("&Help"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- // TRUE is to force the frame to close
- Close(TRUE);
+ // true is to force the frame to close
+ Close(true);
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxString msg;
- msg.Printf( _T("This is the about dialog of splittree sample.\n")
- _T("Welcome to %s"), wxVERSION_STRING);
+ msg.Printf( wxT("This is the about dialog of splittree sample.\n")
+ wxT("Welcome to %s"), wxVERSION_STRING);
- wxMessageBox(msg, "About Tree Test", wxOK | wxICON_INFORMATION, this);
+ wxMessageBox(msg, wxT("About Tree Test"), wxOK | wxICON_INFORMATION, this);
}
/*
const wxSize& sz, long style):
wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style)
{
- m_imageList = new wxImageList(16, 16, TRUE);
+ m_imageList = new wxImageList(16, 16, true);
#if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
m_imageList->Add(wxIcon(icon1_xpm));
m_imageList->Add(wxIcon(icon2_xpm));
#endif
SetImageList(m_imageList);
-
- // Add some dummy items
- wxTreeItemId rootId = AddRoot(_("Root"), -1, -1);
- int i;
- for (i = 1; i <= 20; i++)
- {
- wxString label;
- label.Printf(wxT("Item %d"), i);
- wxTreeItemId id = AppendItem(rootId, label, 0);
- //SetItemImage( id, 1, wxTreeItemIcon_Expanded );
-
- int j;
- for (j = 0; j < 10; j++)
- AppendItem(id, _("Child"), 1);
- }
- Expand(rootId);
+
+ // Add some dummy items
+ wxTreeItemId rootId = AddRoot(_("Root"), -1, -1);
+ int i;
+ for (i = 1; i <= 20; i++)
+ {
+ wxString label;
+ label.Printf(wxT("Item %d"), i);
+ wxTreeItemId id = AppendItem(rootId, label, 0);
+ //SetItemImage( id, 1, wxTreeItemIcon_Expanded );
+
+ int j;
+ for (j = 0; j < 10; j++)
+ AppendItem(id, _("Child"), 1);
+ }
+ Expand(rootId);
}
TestTree::~TestTree()
{
- SetImageList(NULL);
- delete m_imageList;
+ SetImageList(NULL);
+ delete m_imageList;
}
/*
long style):
wxTreeCompanionWindow(parent, id, pos, sz, style)
{
- SetBackgroundColour(* wxWHITE);
+ SetBackgroundColour(* wxWHITE);
}
projects / wxWidgets.git / blobdiff