1. Pause()/Resume() implemented for wxMSW
2. crash on startup in the sample corrected git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -31,66 +31,80 @@
|
||||
// Define a new application type
|
||||
class MyApp: public wxApp
|
||||
{
|
||||
public:
|
||||
public:
|
||||
bool OnInit(void);
|
||||
};
|
||||
|
||||
WX_DEFINE_ARRAY(wxThread *,wxArrayThread);
|
||||
WX_DEFINE_ARRAY(wxThread *, wxArrayThread);
|
||||
|
||||
// Define a new frame type
|
||||
class MyFrame: public wxFrame
|
||||
{
|
||||
public:
|
||||
public:
|
||||
// ctor
|
||||
MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
|
||||
|
||||
public:
|
||||
// operations
|
||||
void WriteText(const wxString& text) { m_txtctrl->WriteText(text); }
|
||||
|
||||
// callbacks
|
||||
void OnQuit(wxCommandEvent& event);
|
||||
void OnAbout(wxCommandEvent& event);
|
||||
|
||||
void OnStartThread(wxCommandEvent& event);
|
||||
void OnStopThread(wxCommandEvent& event);
|
||||
void OnPauseThread(wxCommandEvent& event);
|
||||
void OnResumeThread(wxCommandEvent& event);
|
||||
|
||||
void OnSize(wxSizeEvent &event);
|
||||
bool OnClose(void) { return TRUE; }
|
||||
|
||||
public:
|
||||
wxArrayThread m_threads;
|
||||
|
||||
public:
|
||||
wxArrayThread m_threads;
|
||||
wxTextCtrl *m_txtctrl;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
private:
|
||||
wxTextCtrl *m_txtctrl;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
class MyThread: public wxThread
|
||||
{
|
||||
public:
|
||||
public:
|
||||
MyThread(MyFrame *frame);
|
||||
|
||||
|
||||
void *Entry();
|
||||
public:
|
||||
|
||||
public:
|
||||
size_t m_count;
|
||||
MyFrame *m_frame;
|
||||
};
|
||||
|
||||
MyThread::MyThread(MyFrame *frame)
|
||||
: wxThread()
|
||||
: wxThread()
|
||||
{
|
||||
m_frame = frame;
|
||||
m_count = 0;
|
||||
m_frame = frame;
|
||||
}
|
||||
|
||||
void *MyThread::Entry()
|
||||
{
|
||||
wxString text;
|
||||
wxString text;
|
||||
|
||||
DeferDestroy(TRUE);
|
||||
|
||||
while (1) {
|
||||
TestDestroy();
|
||||
wxMutexGuiEnter();
|
||||
|
||||
text.Printf("Thread 0x%x: Hello !\n", GetID());
|
||||
DeferDestroy(TRUE);
|
||||
text.Printf("[%u] Thread 0x%x here.\n", ++m_count, GetID());
|
||||
m_frame->WriteText(text);
|
||||
|
||||
while (1) {
|
||||
TestDestroy();
|
||||
wxMutexGuiEnter();
|
||||
m_frame->m_txtctrl->WriteText(text);
|
||||
wxMutexGuiLeave();
|
||||
wxSleep(1);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
wxMutexGuiLeave();
|
||||
wxSleep(1);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// ID for the menu commands
|
||||
@@ -100,14 +114,17 @@ void *MyThread::Entry()
|
||||
#define TEST_START_THREAD 103
|
||||
#define TEST_STOP_THREAD 104
|
||||
#define TEST_PAUSE_THREAD 105
|
||||
#define TEST_RESUME_THREAD 106
|
||||
|
||||
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU(TEST_QUIT, MyFrame::OnQuit)
|
||||
EVT_MENU(TEST_ABOUT, MyFrame::OnAbout)
|
||||
EVT_MENU(TEST_START_THREAD, MyFrame::OnStartThread)
|
||||
EVT_MENU(TEST_STOP_THREAD, MyFrame::OnStopThread)
|
||||
EVT_MENU(TEST_PAUSE_THREAD, MyFrame::OnPauseThread)
|
||||
EVT_SIZE(MyFrame::OnSize)
|
||||
EVT_MENU(TEST_QUIT, MyFrame::OnQuit)
|
||||
EVT_MENU(TEST_ABOUT, MyFrame::OnAbout)
|
||||
EVT_MENU(TEST_START_THREAD, MyFrame::OnStartThread)
|
||||
EVT_MENU(TEST_STOP_THREAD, MyFrame::OnStopThread)
|
||||
EVT_MENU(TEST_PAUSE_THREAD, MyFrame::OnPauseThread)
|
||||
EVT_MENU(TEST_RESUME_THREAD, MyFrame::OnResumeThread)
|
||||
|
||||
EVT_SIZE(MyFrame::OnSize)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
// Create a new application object
|
||||
@@ -116,93 +133,117 @@ IMPLEMENT_APP (MyApp)
|
||||
// `Main program' equivalent, creating windows and returning main app frame
|
||||
bool MyApp::OnInit(void)
|
||||
{
|
||||
// Create the main frame window
|
||||
MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Minimal wxWindows App", 50, 50, 450, 340);
|
||||
|
||||
// Make a menubar
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
|
||||
file_menu->Append(TEST_ABOUT, "&About");
|
||||
file_menu->Append(TEST_QUIT, "E&xit");
|
||||
wxMenuBar *menu_bar = new wxMenuBar;
|
||||
menu_bar->Append(file_menu, "&File");
|
||||
|
||||
wxMenu *thread_menu = new wxMenu;
|
||||
thread_menu->Append(TEST_START_THREAD, "Start a new thread");
|
||||
thread_menu->Append(TEST_STOP_THREAD, "Stop a running thread");
|
||||
thread_menu->Append(TEST_PAUSE_THREAD, "Pause a running thread");
|
||||
menu_bar->Append(thread_menu, "Thread");
|
||||
frame->SetMenuBar(menu_bar);
|
||||
|
||||
// Make a panel with a message
|
||||
wxPanel *panel = new wxPanel( frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL );
|
||||
|
||||
(void)new wxStaticText( panel, -1, "Log window", wxPoint(10,10) );
|
||||
|
||||
|
||||
frame->m_txtctrl = new wxTextCtrl(panel, -1, "", wxPoint(10,30), wxSize(390, 190),
|
||||
wxTE_MULTILINE);
|
||||
|
||||
// Show the frame
|
||||
frame->Show(TRUE);
|
||||
|
||||
SetTopWindow(frame);
|
||||
|
||||
return TRUE;
|
||||
// Create the main frame window
|
||||
MyFrame *frame = new MyFrame((wxFrame *) NULL, "wxWindows thread sample",
|
||||
50, 50, 450, 340);
|
||||
|
||||
// Make a menubar
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
|
||||
file_menu->Append(TEST_ABOUT, "&About");
|
||||
file_menu->Append(TEST_QUIT, "E&xit");
|
||||
wxMenuBar *menu_bar = new wxMenuBar;
|
||||
menu_bar->Append(file_menu, "&File");
|
||||
|
||||
wxMenu *thread_menu = new wxMenu;
|
||||
thread_menu->Append(TEST_START_THREAD, "Start a new thread");
|
||||
thread_menu->Append(TEST_STOP_THREAD, "Stop a running thread");
|
||||
thread_menu->AppendSeparator();
|
||||
thread_menu->Append(TEST_PAUSE_THREAD, "Pause a running thread");
|
||||
thread_menu->Append(TEST_RESUME_THREAD, "Resume suspended thread");
|
||||
menu_bar->Append(thread_menu, "Thread");
|
||||
frame->SetMenuBar(menu_bar);
|
||||
|
||||
// Show the frame
|
||||
frame->Show(TRUE);
|
||||
|
||||
SetTopWindow(frame);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// My frame constructor
|
||||
MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
|
||||
wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
|
||||
{}
|
||||
MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
|
||||
: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
|
||||
{
|
||||
wxPanel *panel = new wxPanel(this, -1, wxPoint(0, 0), wxSize(400, 200),
|
||||
wxTAB_TRAVERSAL );
|
||||
|
||||
m_txtctrl = new wxTextCtrl(panel, -1, "", wxPoint(10,30), wxSize(390, 190),
|
||||
wxTE_MULTILINE);
|
||||
|
||||
(void)new wxStaticText(panel, -1, "Log window", wxPoint(10,10));
|
||||
}
|
||||
|
||||
void MyFrame::OnStartThread(wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
MyThread *thread = new MyThread(this);
|
||||
|
||||
thread->Create();
|
||||
|
||||
m_threads.Add(thread);
|
||||
MyThread *thread = new MyThread(this);
|
||||
|
||||
thread->Create();
|
||||
|
||||
m_threads.Add(thread);
|
||||
}
|
||||
|
||||
void MyFrame::OnStopThread(wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
int no_thrd = m_threads.Count()-1;
|
||||
int no_thrd = m_threads.Count()-1;
|
||||
|
||||
if (no_thrd < 0)
|
||||
return;
|
||||
|
||||
delete (m_threads[no_thrd]);
|
||||
m_threads.Remove(no_thrd);
|
||||
}
|
||||
|
||||
if (no_thrd < 0)
|
||||
return;
|
||||
|
||||
delete (m_threads[no_thrd]);
|
||||
m_threads.Remove(no_thrd);
|
||||
void MyFrame::OnResumeThread(wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
// resume first suspended thread
|
||||
size_t n = 0;
|
||||
while ( n < m_threads.Count() && m_threads[n]->IsPaused() )
|
||||
n--;
|
||||
|
||||
if ( n < 0 )
|
||||
wxLogError("No thread to pause!");
|
||||
else
|
||||
m_threads[n]->Resume();
|
||||
}
|
||||
|
||||
void MyFrame::OnPauseThread(wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
// pause last running thread
|
||||
int n = m_threads.Count() - 1;
|
||||
while ( n >= 0 && !m_threads[n]->IsRunning() )
|
||||
n--;
|
||||
|
||||
if ( n < 0 )
|
||||
wxLogError("No thread to pause!");
|
||||
else
|
||||
m_threads[n]->Pause();
|
||||
}
|
||||
|
||||
void MyFrame::OnSize(wxSizeEvent& event )
|
||||
{
|
||||
wxFrame::OnSize(event);
|
||||
|
||||
wxSize size( GetClientSize() );
|
||||
|
||||
m_txtctrl->SetSize( 10, 30, size.x-20, size.y-40 );
|
||||
wxFrame::OnSize(event);
|
||||
|
||||
wxSize size( GetClientSize() );
|
||||
|
||||
m_txtctrl->SetSize( 10, 30, size.x-20, size.y-40 );
|
||||
}
|
||||
|
||||
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
unsigned int i;
|
||||
for (i=0;i<m_threads.Count();i++)
|
||||
delete (m_threads[i]);
|
||||
Close(TRUE);
|
||||
unsigned int i;
|
||||
for (i=0;i<m_threads.Count();i++)
|
||||
delete (m_threads[i]);
|
||||
Close(TRUE);
|
||||
}
|
||||
|
||||
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
wxMessageDialog dialog(this, "wxThread sample (based on minimal)\nJulian Smart and Guilhem Lavaux",
|
||||
"About wxThread sample", wxYES_NO|wxCANCEL);
|
||||
|
||||
dialog.ShowModal();
|
||||
wxMessageDialog dialog(this, "wxThread sample (based on minimal)\nJulian Smart and Guilhem Lavaux",
|
||||
"About wxThread sample", wxYES_NO|wxCANCEL);
|
||||
|
||||
dialog.ShowModal();
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user