Unicode compilation fix

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

diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index dd421d794dce67150dc52e49ee8143c1c5f37bc4..248b3dee4437816a5a5435d7bcbd6571169f07bb 100644 (file)
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -30,6 +30,8 @@
 
 #include "wx/progdlg.h"
 
 
 #include "wx/progdlg.h"
 

+#include "../sample.xpm"
+

 // define this to use wxExecute in the exec tests, otherwise just use system
 #define USE_EXECUTE
 
 // define this to use wxExecute in the exec tests, otherwise just use system
 #define USE_EXECUTE
 


@@ -47,7 +49,7 @@ class MyApp : public wxApp
 {
 public:
     MyApp();
 {
 public:
     MyApp();

-    virtual ~MyApp();
+    virtual ~MyApp(){};

 
     virtual bool OnInit();
 
 
     virtual bool OnInit();
 


@@ -132,7 +134,8 @@ private:
 // ID for the menu commands
 enum
 {
 // ID for the menu commands
 enum
 {

-    THREAD_QUIT          = 1,
+    THREAD_QUIT  = wxID_EXIT,
+    THREAD_ABOUT = wxID_ABOUT,

     THREAD_TEXT          = 101,
     THREAD_CLEAR,
     THREAD_START_THREAD  = 201,
     THREAD_TEXT          = 101,
     THREAD_CLEAR,
     THREAD_START_THREAD  = 201,


@@ -146,7 +149,6 @@ enum
     THREAD_EXEC_THREAD,
 
     THREAD_SHOWCPUS,
     THREAD_EXEC_THREAD,
 
     THREAD_SHOWCPUS,

-    THREAD_ABOUT,

 
     WORKER_EVENT    // this one gets sent from the worker thread
 };
 
     WORKER_EVENT    // this one gets sent from the worker thread
 };


@@ -358,10 +360,6 @@ MyApp::MyApp()
     m_waitingUntilAllDone = false;
 }
 
     m_waitingUntilAllDone = false;
 }
 

-MyApp::~MyApp()
-{
-}
-

 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {


@@ -405,7 +403,7 @@ bool MyApp::OnInit()
     menuBar->Append(menuHelp, _T("&Help"));
 
     frame->SetMenuBar(menuBar);
     menuBar->Append(menuHelp, _T("&Help"));
 
     frame->SetMenuBar(menuBar);

-
+    

     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);
 


@@ -419,6 +417,8 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title,
                  int x, int y, int w, int h)
        : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
                  int x, int y, int w, int h)
        : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {

+    SetIcon(wxIcon(sample_xpm));
+    

     m_nRunning = m_nCount = 0;
 
     m_dlgProgress = (wxProgressDialog *)NULL;
     m_nRunning = m_nCount = 0;
 
     m_dlgProgress = (wxProgressDialog *)NULL;


@@ -730,6 +730,7 @@ void MyFrame::OnStartWorker(wxCommandEvent& WXUNUSED(event))
     if ( thread->Create() != wxTHREAD_NO_ERROR )
     {
         wxLogError(wxT("Can't create thread!"));
     if ( thread->Create() != wxTHREAD_NO_ERROR )
     {
         wxLogError(wxT("Can't create thread!"));

+        return;

     }
 
     m_dlgProgress = new wxProgressDialog
     }
 
     m_dlgProgress = new wxProgressDialog