Create a wrapper file for X11/XKBlib.h header.

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

diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 6b0903cb827b522220947cb4b8fbca3c7cee5fd8..a8529189ed49b7fff3c602d8ed86606dcde7917e 100644 (file)
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -378,7 +378,7 @@ MyFrame::MyFrame(const wxString& title)
     wxMenu *menuHelp = new wxMenu;
     menuHelp->Append(THREAD_SHOWCPUS, wxT("&Show CPU count"));
     menuHelp->AppendSeparator();
     wxMenu *menuHelp = new wxMenu;
     menuHelp->Append(THREAD_SHOWCPUS, wxT("&Show CPU count"));
     menuHelp->AppendSeparator();

-    menuHelp->Append(THREAD_ABOUT, wxT("&About..."));
+    menuHelp->Append(THREAD_ABOUT, wxT("&About"));

     menuBar->Append(menuHelp, wxT("&Help"));
 
     SetMenuBar(menuBar);
     menuBar->Append(menuHelp, wxT("&Help"));
 
     SetMenuBar(menuBar);


@@ -479,7 +479,7 @@ MyFrame::DoLogRecord(wxLogLevel level,
         wxDateTime(info.timestamp).FormatISOTime(),
         info.threadId == wxThread::GetMainId()
             ? wxString("main")
         wxDateTime(info.timestamp).FormatISOTime(),
         info.threadId == wxThread::GetMainId()
             ? wxString("main")

-            : wxString::Format("%x", info.threadId),
+            : wxString::Format("%lx", info.threadId),

         msg + "\n"
     );
 }
         msg + "\n"
     );
 }