remove references to datetime_constants; they're not needed anymore

[wxWidgets.git] / interface / wx / thread.h

diff --git a/interface/wx/thread.h b/interface/wx/thread.h
index 91e40106911b2cc902834c087a06fe99935476f8..0d27327b2549fc4f0311c704cca257fa01e49fb0 100644 (file)
--- a/interface/wx/thread.h
+++ b/interface/wx/thread.h
@@ -279,7 +279,7 @@ public:
 
     Example:
     @code
 
     Example:
     @code

-        extern const wxEventType wxEVT_COMMAND_MYTHREAD_UPDATE;
+        wxDECLARE_EVENT(wxEVT_COMMAND_MYTHREAD_UPDATE, wxThreadEvent);

 
         class MyFrame : public wxFrame, public wxThreadHelper
         {
 
         class MyFrame : public wxFrame, public wxThreadHelper
         {


@@ -298,7 +298,7 @@ public:
 
             ...
             void DoStartALongTask();
 
             ...
             void DoStartALongTask();

-            void OnThreadUpdate(wxCommandEvent& evt);
+            void OnThreadUpdate(wxThreadEvent& evt);

             void OnClose(wxCloseEvent& evt);
             ...
 
             void OnClose(wxCloseEvent& evt);
             ...
 


@@ -312,7 +312,7 @@ public:
             DECLARE_EVENT_TABLE()
         };
 
             DECLARE_EVENT_TABLE()
         };
 

-        DEFINE_EVENT_TYPE(wxEVT_COMMAND_MYTHREAD_UPDATE)
+        wxDEFINE_EVENT(wxEVT_COMMAND_MYTHREAD_UPDATE, wxThreadEvent)

         BEGIN_EVENT_TABLE(MyFrame, wxFrame)
             EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_MYTHREAD_UPDATE, MyFrame::OnThreadUpdate)
             EVT_CLOSE(MyFrame::OnClose)
         BEGIN_EVENT_TABLE(MyFrame, wxFrame)
             EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_MYTHREAD_UPDATE, MyFrame::OnThreadUpdate)
             EVT_CLOSE(MyFrame::OnClose)


@@ -364,7 +364,7 @@ public:
 
                 // VERY IMPORTANT: do not call any GUI function inside this
                 //                 function; rather use wxQueueEvent():
 
                 // VERY IMPORTANT: do not call any GUI function inside this
                 //                 function; rather use wxQueueEvent():

-                wxQueueEvent(this, new wxCommandEvent(wxEVT_COMMAND_MYTHREAD_UPDATE));
+                wxQueueEvent(this, new wxThreadEvent(wxEVT_COMMAND_MYTHREAD_UPDATE));

                     // we used pointer 'this' assuming it's safe; see OnClose()
             }
 
                     // we used pointer 'this' assuming it's safe; see OnClose()
             }
 


@@ -386,7 +386,7 @@ public:
             Destroy();
         }
 
             Destroy();
         }
 

-        void MyFrame::OnThreadUpdate(wxCommandEvent&evt)
+        void MyFrame::OnThreadUpdate(wxThreadEvent& evt)

         {
             // ...do something... e.g. m_pGauge->Pulse();
 
         {
             // ...do something... e.g. m_pGauge->Pulse();
 


@@ -399,7 +399,7 @@ public:
     @library{wxbase}
     @category{threading}
 
     @library{wxbase}
     @category{threading}
 

-    @see wxThread
+    @see wxThread, wxThreadEvent

 */
 class wxThreadHelper
 {
 */
 class wxThreadHelper
 {


@@ -631,8 +631,8 @@ enum
 
     @code
     // declare a new type of event, to be used by our MyThread class:
 
     @code
     // declare a new type of event, to be used by our MyThread class:

-    extern const wxEventType wxEVT_COMMAND_MYTHREAD_COMPLETED;
-    extern const wxEventType wxEVT_COMMAND_MYTHREAD_UPDATE;
+    wxDECLARE_EVENT(wxEVT_COMMAND_MYTHREAD_COMPLETED, wxThreadEvent);
+    wxDECLARE_EVENT(wxEVT_COMMAND_MYTHREAD_UPDATE, wxThreadEvent);

     class MyFrame;
 
     class MyThread : public wxThread
     class MyFrame;
 
     class MyThread : public wxThread


@@ -669,7 +669,8 @@ enum
         // a resume routine would be nearly identic to DoPauseThread()
         void DoResumeThread() { ... }
 
         // a resume routine would be nearly identic to DoPauseThread()
         void DoResumeThread() { ... }
 

-        void OnThreadCompletion(wxCommandEvent&);
+        void OnThreadUpdate(wxThreadEvent&);
+        void OnThreadCompletion(wxThreadEvent&);

         void OnClose(wxCloseEvent&);
 
     protected:
         void OnClose(wxCloseEvent&);
 
     protected:


@@ -686,8 +687,8 @@ enum
         EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_MYTHREAD_COMPLETED, MyFrame::OnThreadCompletion)
     END_EVENT_TABLE()
 
         EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_MYTHREAD_COMPLETED, MyFrame::OnThreadCompletion)
     END_EVENT_TABLE()
 

-    DEFINE_EVENT_TYPE(wxEVT_COMMAND_MYTHREAD_COMPLETED)
-    DEFINE_EVENT_TYPE(wxEVT_COMMAND_MYTHREAD_UPDATE)
+    wxDEFINE_EVENT(wxEVT_COMMAND_MYTHREAD_COMPLETED, wxThreadEvent)
+    wxDEFINE_EVENT(wxEVT_COMMAND_MYTHREAD_UPDATE, wxThreadEvent)

 
     void MyFrame::DoStartThread()
     {
 
     void MyFrame::DoStartThread()
     {


@@ -721,13 +722,13 @@ enum
         {
             // ... do a bit of work...
 
         {
             // ... do a bit of work...
 

-            wxQueueEvent(m_pHandler, new wxCommandEvent(wxEVT_COMMAND_MYTHREAD_UPDATE));
+            wxQueueEvent(m_pHandler, new wxThreadEvent(wxEVT_COMMAND_MYTHREAD_UPDATE));

         }
 
         // signal the event handler that this thread is going to be destroyed
         // NOTE: here we assume that using the m_pHandler pointer is safe,
         //       (in this case this is assured by the MyFrame destructor)
         }
 
         // signal the event handler that this thread is going to be destroyed
         // NOTE: here we assume that using the m_pHandler pointer is safe,
         //       (in this case this is assured by the MyFrame destructor)

-        wxQueueEvent(m_pHandler, new wxCommandEvent(wxEVT_COMMAND_MYTHREAD_COMPLETED));
+        wxQueueEvent(m_pHandler, new wxThreadEvent(wxEVT_COMMAND_MYTHREAD_COMPLETED));

 
         return (wxThread::ExitCode)0;     // success
     }
 
         return (wxThread::ExitCode)0;     // success
     }


@@ -740,12 +741,12 @@ enum
         m_pHandler->m_pThread = NULL;
     }
 
         m_pHandler->m_pThread = NULL;
     }
 

-    void MyFrame::OnThreadCompletion(wxCommandEvent&)
+    void MyFrame::OnThreadCompletion(wxThreadEvent&)

     {
         wxMessageOutputDebug().Printf("MYFRAME: MyThread exited!\n");
     }
 
     {
         wxMessageOutputDebug().Printf("MYFRAME: MyThread exited!\n");
     }
 

-    void MyFrame::OnThreadUpdate(wxCommandEvent&)
+    void MyFrame::OnThreadUpdate(wxThreadEvent&)

     {
         wxMessageOutputDebug().Printf("MYFRAME: MyThread update...\n");
     }
     {
         wxMessageOutputDebug().Printf("MYFRAME: MyThread update...\n");
     }


@@ -863,9 +864,9 @@ enum
     as MFC.
 
     A workaround for some wxWidgets ports is calling wxMutexGUIEnter()
     as MFC.
 
     A workaround for some wxWidgets ports is calling wxMutexGUIEnter()

-    before any GUI calls and then calling wxMutexGUILeave() afterwords. However,
-    the recommended way is to simply process the GUI calls in the main thread
-    through an event that is posted by wxQueueEvent().
+    before any GUI calls and then calling wxMutexGUILeave() afterwords.
+    However, the recommended way is to simply process the GUI calls in the main
+    thread through an event that is posted by wxQueueEvent().

     This does not imply that calls to these classes are thread-safe, however,
     as most wxWidgets classes are not thread-safe, including wxString.
 
     This does not imply that calls to these classes are thread-safe, however,
     as most wxWidgets classes are not thread-safe, including wxString.
 


@@ -984,7 +985,7 @@ public:
         Returns the platform specific thread ID of the current thread as a long.
         This can be used to uniquely identify threads, even if they are not wxThreads.
     */
         Returns the platform specific thread ID of the current thread as a long.
         This can be used to uniquely identify threads, even if they are not wxThreads.
     */

-    static unsigned long GetCurrentId();
+    static wxThreadIdType GetCurrentId();

 
     /**
         Gets the thread identifier: this is a platform dependent number that uniquely
 
     /**
         Gets the thread identifier: this is a platform dependent number that uniquely


@@ -1620,6 +1621,8 @@ public:
 */
 bool wxIsMainThread();
 
 */
 bool wxIsMainThread();
 

+
+

 /**
     This function must be called when any thread other than the main GUI thread
     wants to get access to the GUI library. This function will block the
 /**
     This function must be called when any thread other than the main GUI thread
     wants to get access to the GUI library. This function will block the


@@ -1645,7 +1648,7 @@ bool wxIsMainThread();
     @endcode
 
     This function is only defined on platforms which support preemptive
     @endcode
 
     This function is only defined on platforms which support preemptive

-    threads.
+    threads and only works under some ports (wxMSW currently).

 
     @note Under GTK, no creation of top-level windows is allowed in any thread
           but the main one.
 
     @note Under GTK, no creation of top-level windows is allowed in any thread
           but the main one.