X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41f02b9acc01217e918fa422298840df7cf6de25..b7421ab62574f7de584b2edf1270753277353371:/samples/collpane/collpane.cpp?ds=sidebyside

diff --git a/samples/collpane/collpane.cpp b/samples/collpane/collpane.cpp
index 0e3d76e487..fccfa6a56f 100644
--- a/samples/collpane/collpane.cpp
+++ b/samples/collpane/collpane.cpp
@@ -55,7 +55,7 @@
 // ID for the menu commands
 enum
 {
-    PANE_COLLAPSE,
+    PANE_COLLAPSE = 100,
     PANE_EXPAND,
     PANE_SETLABEL,
     PANE_SHOWDLG,
@@ -78,7 +78,7 @@ public:
 
     virtual bool OnInit();
 
-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
 class MyFrame: public wxFrame
@@ -104,7 +104,7 @@ private:
     wxBoxSizer *m_paneSizer;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MyFrame)
+    wxDECLARE_NO_COPY_CLASS(MyFrame);
 };
 
 class MyDialog : public wxDialog
@@ -120,7 +120,7 @@ private:
     wxGridSizer *m_paneSizer;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MyDialog)
+    wxDECLARE_NO_COPY_CLASS(MyDialog);
 };
 
 
@@ -166,7 +166,7 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame()
-       : wxFrame(NULL, wxID_ANY, _T("wxCollapsiblePane sample"),
+       : wxFrame(NULL, wxID_ANY, wxT("wxCollapsiblePane sample"),
                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
@@ -178,12 +178,12 @@ MyFrame::MyFrame()
 
     // Make a menubar
     wxMenu *paneMenu = new wxMenu;
-    paneMenu->Append(PANE_COLLAPSE, _T("Collapse\tCtrl-C"));
-    paneMenu->Append(PANE_EXPAND, _T("Expand\tCtrl-E"));
+    paneMenu->Append(PANE_COLLAPSE, wxT("Collapse\tCtrl-C"));
+    paneMenu->Append(PANE_EXPAND, wxT("Expand\tCtrl-E"));
     paneMenu->AppendSeparator();
-    paneMenu->Append(PANE_SETLABEL, _T("Set label...\tCtrl-L"));
+    paneMenu->Append(PANE_SETLABEL, wxT("Set label...\tCtrl-L"));
     paneMenu->AppendSeparator();
-    paneMenu->Append(PANE_SHOWDLG, _T("Show dialog...\tCtrl-S"));
+    paneMenu->Append(PANE_SHOWDLG, wxT("Show dialog...\tCtrl-S"));
     paneMenu->AppendSeparator();
     paneMenu->Append(PANE_QUIT);
 
@@ -191,8 +191,8 @@ MyFrame::MyFrame()
     helpMenu->Append(PANE_ABOUT);
 
     wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append(paneMenu, _T("&Pane"));
-    menuBar->Append(helpMenu, _T("&Help"));
+    menuBar->Append(paneMenu, wxT("&Pane"));
+    menuBar->Append(helpMenu, wxT("&Help"));
     SetMenuBar(menuBar);
 
     m_collPane = new wxCollapsiblePane(this, -1, wxT("test!"));
@@ -249,7 +249,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
     wxAboutDialogInfo info;
     info.SetName(_("wxCollapsiblePane sample"));
     info.SetDescription(_("This sample program demonstrates usage of wxCollapsiblePane"));
-    info.SetCopyright(_T("(C) 2006 Francesco Montorsi <frm@users.sourceforge.net>"));
+    info.SetCopyright(wxT("(C) 2006 Francesco Montorsi <frm@users.sourceforge.net>"));
 
     wxAboutBox(info);
 }
@@ -328,9 +328,9 @@ void MyDialog::OnAlignButton(wxCommandEvent& WXUNUSED(ev))
    Layout();
 }
 
-void MyDialog::OnPaneChanged(wxCollapsiblePaneEvent &event)
+void MyDialog::OnPaneChanged(wxCollapsiblePaneEvent& event)
 {
-    wxLogDebug(wxT("The pane has just been %s by the user"),
+    wxLogMessage(wxT("The pane has just been %s by the user"),
                event.GetCollapsed() ? wxT("collapsed") : wxT("expanded"));
 }