Improved wxDataViewSpinCtrlRenderer under OS X

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 6ca2a7abd43f444f468f77f96570ddf9efecb6ad..2ab570ed62eef23d3ab9317718ce054b94f6dc87 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -1314,8 +1314,9 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 static const wxChar *GetDataString(wxClientData *data)
 {
 
 static const wxChar *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")
+    ).c_str();

 }
 
 void MyPanel::OnChoice( wxCommandEvent &event )
 }
 
 void MyPanel::OnChoice( wxCommandEvent &event )


@@ -1933,24 +1934,30 @@ void MyFrame::OnSize( wxSizeEvent& event )
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     // track the window which has the focus in the status bar
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     // track the window which has the focus in the status bar

-    static wxWindow *s_windowFocus = (wxWindow *)NULL;
+    static wxWindow *s_windowFocus = NULL;

     wxWindow *focus = wxWindow::FindFocus();
     wxWindow *focus = wxWindow::FindFocus();

-    if ( focus && (focus != s_windowFocus) )
+    if ( focus != s_windowFocus )

     {
         s_windowFocus = focus;
 
         wxString msg;
     {
         s_windowFocus = focus;
 
         wxString msg;

-        msg.Printf(
+        if ( focus )
+        {
+            msg.Printf(
+                    _T("Focus: %s")

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-                _T("Focus: %s, HWND = %08x"),
-#else
-                _T("Focus: %s"),
+                    , _T(", HWND = %08x")

 #endif
 #endif

-                s_windowFocus->GetClassInfo()->GetClassName()
+                    , s_windowFocus->GetName().c_str()

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-                , (unsigned int) s_windowFocus->GetHWND()
+                    , (unsigned int) s_windowFocus->GetHWND()

 #endif
 #endif

-                  );
+                      );
+        }
+        else
+        {
+            msg = _T("No focus");
+        }

 
 #if wxUSE_STATUSBAR
         SetStatusText(msg);
 
 #if wxUSE_STATUSBAR
         SetStatusText(msg);