projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed code that already exist in ~wxTLWBase from ~wxTLW
[wxWidgets.git]
/
include
/
wx
/
thread.h
diff --git
a/include/wx/thread.h
b/include/wx/thread.h
index 3ef7e47adec2666aa96d50e4c9877a035fa5dcc1..036b3d0adb60364feb2d3b7c082c0bd2dadd7c52 100644
(file)
--- a/
include/wx/thread.h
+++ b/
include/wx/thread.h
@@
-349,9
+349,10
@@
public:
wxCondError Broadcast();
wxCondError Broadcast();
+#if WXWIN_COMPATIBILITY_2_6
// deprecated version, don't use
// deprecated version, don't use
- bool Wait(unsigned long milliseconds)
- { return WaitTimeout(milliseconds) == wxCOND_NO_ERROR; }
+ wxDEPRECATED( bool Wait(unsigned long milliseconds) );
+#endif // WXWIN_COMPATIBILITY_2_6
private:
wxConditionInternal *m_internal;
private:
wxConditionInternal *m_internal;
@@
-359,6
+360,11
@@
private:
DECLARE_NO_COPY_CLASS(wxCondition)
};
DECLARE_NO_COPY_CLASS(wxCondition)
};
+#if WXWIN_COMPATIBILITY_2_6
+ inline bool wxCondition::Wait(unsigned long milliseconds)
+ { return WaitTimeout(milliseconds) == wxCOND_NO_ERROR; }
+#endif // WXWIN_COMPATIBILITY_2_6
+
// ----------------------------------------------------------------------------
// wxSemaphore: a counter limiting the number of threads concurrently accessing
// a shared resource
// ----------------------------------------------------------------------------
// wxSemaphore: a counter limiting the number of threads concurrently accessing
// a shared resource