X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/945d96f6e25215eb9adaf98a09942d1d0b94c35d..cc8bc5aa9cd14c158de637acb9e5ed8beb066d57:/samples/regtest/regtest.cpp

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index b3e3367cbf..dd05152ec7 100644
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -181,7 +181,7 @@ class RegFrame : public wxFrame
 {
 public:
     // ctor & dtor
-    RegFrame(wxFrame *parent, wxChar *title, int x, int y, int w, int h);
+    RegFrame(wxFrame *parent, const wxChar *title, int x, int y, int w, int h);
     virtual ~RegFrame();
 
     // callbacks
@@ -331,7 +331,7 @@ bool RegApp::OnInit()
 // RegFrame
 // ----------------------------------------------------------------------------
 
-RegFrame::RegFrame(wxFrame *parent, wxChar *title, int x, int y, int w, int h)
+RegFrame::RegFrame(wxFrame *parent, const wxChar *title, int x, int y, int w, int h)
         : wxFrame(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     // this reduces flicker effects
@@ -361,9 +361,11 @@ RegFrame::RegFrame(wxFrame *parent, wxChar *title, int x, int y, int w, int h)
     m_treeCtrl = new RegTreeCtrl(this, Ctrl_RegTree);
 #endif
 
+#if wxUSE_STATUSBAR
     // create the status line
     // ----------------------
     CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 }
 
 RegFrame::~RegFrame()
@@ -383,7 +385,7 @@ void RegFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageDialog dialog(this,
         _T("wxRegistry sample\n")
-        _T("© 1998, 2000 Vadim Zeitlin"),
+        _T("(c) 1998, 2000 Vadim Zeitlin"),
         _T("About wxRegTest"), wxOK);
 
     dialog.ShowModal();
@@ -697,8 +699,12 @@ void RegTreeCtrl::OnChar(wxKeyEvent& event)
 
 void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
 {
+#if wxUSE_STATUSBAR
     wxFrame *pFrame = (wxFrame *) wxWindow::GetParent();
     pFrame->SetStatusText(GetNode(event)->FullName(), 1);
+#else
+    wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR
 }
 
 void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
@@ -958,7 +964,7 @@ bool RegTreeCtrl::TreeNode::OnExpand()
     while ( bCont )
     {
         wxString strItem;
-        if (str.IsEmpty())
+        if (str.empty())
             strItem = _T("<default>");
         else
             strItem = str;