use kind, not id, of a menu item to test whether it's a separator: this allows having...

[wxWidgets.git] / samples / controls / controls.cpp

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 8f50189633c83aeb6d6c5389db0a98c75a43edaf..0b9b11546dc7e46dddf51e40c0e2ac8a27084a34 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -1015,7 +1015,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     // sizer
     panel = new wxPanel(m_book);
-    panel->SetAutoLayout( true );
 
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
 
@@ -1312,10 +1311,10 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 #if wxUSE_CHOICE
 
-static const wxChar *GetDataString(wxClientData *data)
+static wxString GetDataString(wxClientData *data)
 {
-    return data ? wx_static_cast(wxStringClientData *, data)->GetData().c_str()
-                : _T("none");
+    return data ? wx_static_cast(wxStringClientData *, data)->GetData()
+                : wxString("none");
 }
 
 void MyPanel::OnChoice( wxCommandEvent &event )
@@ -1333,8 +1332,8 @@ void MyPanel::OnChoice( wxCommandEvent &event )
                  _T("data \"%s\"/\"%s\""),
                  (int)event.GetInt(),
                  sel,
-                 event.GetString().c_str(),
-                 choice->GetStringSelection().c_str(),
+                 event.GetString(),
+                 choice->GetStringSelection(),
                  GetDataString(dataEvt),
                  GetDataString(dataCtrl));
 }
@@ -1945,7 +1944,7 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
             msg.Printf(
                     _T("Focus: %s")
 #ifdef __WXMSW__
-                    _T(", HWND = %08x"),
+                    , _T(", HWND = %08x")
 #endif
                     , s_windowFocus->GetName().c_str()
 #ifdef __WXMSW__