projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...
[wxWidgets.git]
/
include
/
wx
/
thread.h
diff --git
a/include/wx/thread.h
b/include/wx/thread.h
index fb33bde0f89d20c9b1fb240e3027f4bc7eb37603..7c7bab4351ea722d28fbd5c5de99a1681ca66938 100644
(file)
--- a/
include/wx/thread.h
+++ b/
include/wx/thread.h
@@
-177,10
+177,10
@@
class WXDLLIMPEXP_BASE wxMutexLocker
public:
// lock the mutex in the ctor
wxMutexLocker(wxMutex& mutex)
public:
// lock the mutex in the ctor
wxMutexLocker(wxMutex& mutex)
- : m_isOk(
FALSE
), m_mutex(mutex)
+ : m_isOk(
false
), m_mutex(mutex)
{ m_isOk = ( m_mutex.Lock() == wxMUTEX_NO_ERROR ); }
{ m_isOk = ( m_mutex.Lock() == wxMUTEX_NO_ERROR ); }
- // returns
TRUE
if mutex was successfully locked in ctor
+ // returns
true
if mutex was successfully locked in ctor
bool IsOk() const
{ return m_isOk; }
bool IsOk() const
{ return m_isOk; }
@@
-209,7
+209,7
@@
private:
// in order to avoid any overhead under platforms where critical sections are
// just mutexes make all wxCriticalSection class functions inline
// in order to avoid any overhead under platforms where critical sections are
// just mutexes make all wxCriticalSection class functions inline
-#if !defined(__WXMSW__)
+#if !defined(__WXMSW__)
&& !defined(__WXMAC__)
#define wxCRITSECT_IS_MUTEX 1
#define wxCRITSECT_INLINE inline
#define wxCRITSECT_IS_MUTEX 1
#define wxCRITSECT_INLINE inline
@@
-249,7
+249,11
@@
private:
// finally, we need this typedef instead of declaring m_buffer directly
// because otherwise the assert mentioned above wouldn't compile with some
// compilers (notably CodeWarrior 8)
// finally, we need this typedef instead of declaring m_buffer directly
// because otherwise the assert mentioned above wouldn't compile with some
// compilers (notably CodeWarrior 8)
+#ifdef __WIN64__
+ typedef char wxCritSectBuffer[40];
+#else // __WIN32__
typedef char wxCritSectBuffer[24];
typedef char wxCritSectBuffer[24];
+#endif
union
{
unsigned long m_dummy1;
union
{
unsigned long m_dummy1;
@@
-257,6
+261,8
@@
private:
wxCritSectBuffer m_buffer;
};
wxCritSectBuffer m_buffer;
};
+#elif defined(__WXMAC__)
+ void *m_critRegion ;
#endif // Unix&OS2/Win32
DECLARE_NO_COPY_CLASS(wxCriticalSection)
#endif // Unix&OS2/Win32
DECLARE_NO_COPY_CLASS(wxCriticalSection)
@@
-275,7
+281,7
@@
private:
#undef wxCRITSECT_IS_MUTEX
// wxCriticalSectionLocker is the same to critical sections as wxMutexLocker is
#undef wxCRITSECT_IS_MUTEX
// wxCriticalSectionLocker is the same to critical sections as wxMutexLocker is
-// to
th
mutexes
+// to mutexes
class WXDLLIMPEXP_BASE wxCriticalSectionLocker
{
public:
class WXDLLIMPEXP_BASE wxCriticalSectionLocker
{
public:
@@
-311,11
+317,11
@@
public:
// dtor is not virtual, don't use this class polymorphically
~wxCondition();
// dtor is not virtual, don't use this class polymorphically
~wxCondition();
- // return
TRUE
if the condition has been created successfully
+ // return
true
if the condition has been created successfully
bool IsOk() const;
// NB: the associated mutex MUST be locked beforehand by the calling thread
bool IsOk() const;
// NB: the associated mutex MUST be locked beforehand by the calling thread
- //
+ //
// it atomically releases the lock on the associated mutex
// and starts waiting to be woken up by a Signal()/Broadcast()
// once its signaled, then it will wait until it can reacquire
// it atomically releases the lock on the associated mutex
// and starts waiting to be woken up by a Signal()/Broadcast()
// once its signaled, then it will wait until it can reacquire
@@
-324,9
+330,9
@@
public:
// exactly as Wait() except that it may also return if the specified
// timeout ellapses even if the condition hasn't been signalled: in this
// exactly as Wait() except that it may also return if the specified
// timeout ellapses even if the condition hasn't been signalled: in this
- // case, the return value is
FALSE
, otherwise (i.e. in case of a normal
- // return) it is
TRUE
- //
+ // case, the return value is
false
, otherwise (i.e. in case of a normal
+ // return) it is
true
+ //
// the timeeout parameter specifies a interval that needs to be waited in
// milliseconds
wxCondError WaitTimeout(unsigned long milliseconds);
// the timeeout parameter specifies a interval that needs to be waited in
// milliseconds
wxCondError WaitTimeout(unsigned long milliseconds);
@@
-373,7
+379,7
@@
public:
// dtor is not virtual, don't use this class polymorphically
~wxSemaphore();
// dtor is not virtual, don't use this class polymorphically
~wxSemaphore();
- // return
TRUE
if the semaphore has been created successfully
+ // return
true
if the semaphore has been created successfully
bool IsOk() const;
// wait indefinitely, until the semaphore count goes beyond 0
bool IsOk() const;
// wait indefinitely, until the semaphore count goes beyond 0
@@
-399,7
+405,7
@@
private:
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
-// wxThread: class enc
pa
sulating a thread of execution
+// wxThread: class enc
ap
sulating a thread of execution
// ----------------------------------------------------------------------------
// there are two different kinds of threads: joinable and detached (default)
// ----------------------------------------------------------------------------
// there are two different kinds of threads: joinable and detached (default)
@@
-459,7
+465,7
@@
public:
// default value (usually acceptable, but may not yield the best
// performance for this process)
//
// default value (usually acceptable, but may not yield the best
// performance for this process)
//
- // Returns
TRUE on success, FALSE
otherwise (if not implemented, for
+ // Returns
true on success, false
otherwise (if not implemented, for
// example)
static bool SetConcurrency(size_t level);
// example)
static bool SetConcurrency(size_t level);
@@
-546,16
+552,16
@@
public:
// NB: this function will not be called if the thread is Kill()ed
virtual void OnExit() { }
// NB: this function will not be called if the thread is Kill()ed
virtual void OnExit() { }
+ // Returns true if the thread was asked to terminate: this function should
+ // be called by the thread from time to time, otherwise the main thread
+ // will be left forever in Delete()!
+ virtual bool TestDestroy();
+
// dtor is public, but the detached threads should never be deleted - use
// Delete() instead (or leave the thread terminate by itself)
virtual ~wxThread();
protected:
// dtor is public, but the detached threads should never be deleted - use
// Delete() instead (or leave the thread terminate by itself)
virtual ~wxThread();
protected:
- // Returns TRUE if the thread was asked to terminate: this function should
- // be called by the thread from time to time, otherwise the main thread
- // will be left forever in Delete()!
- bool TestDestroy();
-
// exits from the current thread - can be called only from this thread
void Exit(ExitCode exitcode = 0);
// exits from the current thread - can be called only from this thread
void Exit(ExitCode exitcode = 0);
@@
-738,7
+744,7
@@
public:
// thread
extern void WXDLLIMPEXP_BASE wxMutexGuiLeaveOrEnter();
// thread
extern void WXDLLIMPEXP_BASE wxMutexGuiLeaveOrEnter();
- // returns
TRUE
if the main thread has GUI lock
+ // returns
true
if the main thread has GUI lock
extern bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread();
#ifndef __WXPM__
extern bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread();
#ifndef __WXPM__
@@
-746,7
+752,7
@@
public:
extern void WXDLLIMPEXP_BASE wxWakeUpMainThread();
#endif // !OS/2
extern void WXDLLIMPEXP_BASE wxWakeUpMainThread();
#endif // !OS/2
- // return
TRUE
if the main thread is waiting for some other to terminate:
+ // return
true
if the main thread is waiting for some other to terminate:
// wxApp then should block all "dangerous" messages
extern bool WXDLLIMPEXP_BASE wxIsWaitingForThread();
#endif // MSW, Mac, OS/2
// wxApp then should block all "dangerous" messages
extern bool WXDLLIMPEXP_BASE wxIsWaitingForThread();
#endif // MSW, Mac, OS/2