Call CreateControl instead of CreateBase

[wxWidgets.git] / src / motif / evtloop.cpp

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index d4b150cddbd96d483959337108e4ebc8d8499270..782ceeab074bee8180b80a8e4973d26f2d35b67a 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "evtloop.h"
 #endif
 
     #pragma implementation "evtloop.h"
 #endif
 


@@ -83,9 +83,7 @@ private:
 
 static bool SendIdleMessage()
 {
 
 static bool SendIdleMessage()
 {

-    wxIdleEvent event;
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();

 }
 
 bool wxEventLoopImpl::SendIdleMessage()
 }
 
 bool wxEventLoopImpl::SendIdleMessage()


@@ -234,7 +232,7 @@ void ProcessXEvent(XEvent* event)
          * window is recieved. Prevents flicker as windows are resized.
          */
 
          * window is recieved. Prevents flicker as windows are resized.
          */
 

-        Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
+        Display *disp = event->xany.display;

         Window win = event->xany.window;
         XEvent report;
 
         Window win = event->xany.window;
         XEvent report;
 


@@ -260,7 +258,7 @@ bool CheckForAccelerator(XEvent* event)
     {
         // Find a wxWindow for this window
         // TODO: should get display for the window, not the current display
     {
         // Find a wxWindow for this window
         // TODO: should get display for the window, not the current display

-        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
+        Widget widget = XtWindowToWidget(event->xany.display,

                                          event->xany.window);
         wxWindow* win = NULL;
 
                                          event->xany.window);
         wxWindow* win = NULL;
 


@@ -294,8 +292,8 @@ bool CheckForKeyDown(XEvent* event)
 {
     if (event->xany.type == KeyPress)
     {
 {
     if (event->xany.type == KeyPress)
     {

-        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
-                     event->xany.window);
+        Widget widget = XtWindowToWidget(event->xany.display,
+                                         event->xany.window);

         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window
         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window


@@ -320,8 +318,8 @@ bool CheckForKeyUp(XEvent* event)
 {
     if (event->xany.type == KeyRelease)
     {
 {
     if (event->xany.type == KeyRelease)
     {

-        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
-                         event->xany.window);
+        Widget widget = XtWindowToWidget(event->xany.display,
+                                         event->xany.window);

         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window
         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window


@@ -402,9 +400,11 @@ public:
 
     virtual bool OnInit()
     {
 
     virtual bool OnInit()
     {

+        // Must be done before modules are initialized
+#if 0

         if( pipe(idleFds) != 0 )
             return false;
         if( pipe(idleFds) != 0 )
             return false;

-
+#endif

         return true;
     }
 
         return true;
     }
 


@@ -463,13 +463,23 @@ static void wxBreakDispatch()
     write( idleFds[1], &dummy, 1 );
 }
 
     write( idleFds[1], &dummy, 1 );
 }
 

-void wxWakeUpIdle()
+void wxApp::WakeUpIdle()

 {
     ::wxBreakDispatch();
 }
 
 {
     ::wxBreakDispatch();
 }
 

+bool wxInitIdleFds()
+{
+    if( pipe(idleFds) != 0 )
+        return false;
+    return true;
+}
+

 bool wxAddIdleCallback()
 {
 bool wxAddIdleCallback()
 {

+    if (!wxInitIdleFds())
+        return false;
+    

     // install input handler for wxWakeUpIdle
     inputId = XtAppAddInput( (XtAppContext) wxTheApp->GetAppContext(),
                              idleFds[0],
     // install input handler for wxWakeUpIdle
     inputId = XtAppAddInput( (XtAppContext) wxTheApp->GetAppContext(),
                              idleFds[0],