Commit 643cc535 authored by Davis King's avatar Davis King

Made the X11 version of the gui_core work with global window objects.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402527
parent 5d29b7b3
This diff is collapsed.
...@@ -31,7 +31,7 @@ namespace dlib ...@@ -31,7 +31,7 @@ namespace dlib
namespace gui_core_kernel_2_globals namespace gui_core_kernel_2_globals
{ {
void event_handler (); class event_handler_thread;
void trigger_user_event_threadproc (void*); void trigger_user_event_threadproc (void*);
// This is a forward declaration for a struct that contains any // This is a forward declaration for a struct that contains any
...@@ -109,7 +109,8 @@ namespace dlib ...@@ -109,7 +109,8 @@ namespace dlib
private: private:
friend void gui_core_kernel_2_globals::event_handler (); friend class gui_core_kernel_2_globals::event_handler_thread;
canvas ( canvas (
unsigned char* bits__, unsigned char* bits__,
...@@ -152,7 +153,7 @@ namespace dlib ...@@ -152,7 +153,7 @@ namespace dlib
class base_window class base_window
{ {
friend void gui_core_kernel_2_globals::event_handler (); friend class gui_core_kernel_2_globals::event_handler_thread;
friend void gui_core_kernel_2_globals::trigger_user_event_threadproc (void*); friend void gui_core_kernel_2_globals::trigger_user_event_threadproc (void*);
public: public:
......
...@@ -41,11 +41,6 @@ namespace dlib ...@@ -41,11 +41,6 @@ namespace dlib
base_window base_window
All methods for this class are thread safe. You may call them All methods for this class are thread safe. You may call them
from any thread and do not need to serialize access. from any thread and do not need to serialize access.
GENERAL WARNING
You can't make base_window objects before main() has been entered or
call get_from_clipboard() or put_on_clipboard() before
main() has been entered.
!*/ !*/
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
...@@ -771,7 +771,7 @@ private: ...@@ -771,7 +771,7 @@ private:
}; };
win w; win w;
int main() int main()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment