Replaced wxDebugMsg with wxLogError.

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index e77149f3a9823263d4c2283d394d660dece0fa79..4ee8f71d5bbe4f496f16e6781f869b5a10a8ab53 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -45,6 +45,7 @@
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"

+#include "wx/evtloop.h"

 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"


@@ -1151,6 +1152,8 @@ void wxWindow::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
 // popup menus
 // ----------------------------------------------------------------------------
 
 // popup menus
 // ----------------------------------------------------------------------------
 

+#if wxUSE_MENUS
+

 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
     Widget widget = (Widget) GetMainWidget();
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
     Widget widget = (Widget) GetMainWidget();


@@ -1165,7 +1168,8 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     if (menu->GetParent() && (menu->GetId() != -1))
         return FALSE;
 
     if (menu->GetParent() && (menu->GetId() != -1))
         return FALSE;
 

-    if (menu->GetMainWidget()) {
+    if (menu->GetMainWidget())
+    {

         menu->DestroyMenu(TRUE);
     }
 
         menu->DestroyMenu(TRUE);
     }
 


@@ -1214,7 +1218,6 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     XmMenuPosition (menuWidget, &event);
     XtManageChild (menuWidget);
 
     XmMenuPosition (menuWidget, &event);
     XtManageChild (menuWidget);
 

-    XEvent x_event;

     // The ID of a pop-up menu is 1 when active, and is set to 0 by the
     // idle-time destroy routine.
     // Waiting until this ID changes causes this function to block until
     // The ID of a pop-up menu is 1 when active, and is set to 0 by the
     // idle-time destroy routine.
     // Waiting until this ID changes causes this function to block until


@@ -1222,29 +1225,19 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     // In other words, once this routine returns, it is safe to delete
     // the menu object.
     // Ian Brown <ian.brown@printsoft.de>
     // In other words, once this routine returns, it is safe to delete
     // the menu object.
     // Ian Brown <ian.brown@printsoft.de>

-    while (menu->GetId() == 1)
-    {
-        XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &x_event);

 
 

-        wxTheApp->ProcessXEvent((WXEvent*) & x_event);
+    wxEventLoop evtLoop;

 
 

-        if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
-        {
-            if (!wxTheApp->ProcessIdle())
-            {
-#if wxUSE_THREADS
-                // leave the main loop to give other threads a chance to
-                // perform their GUI work
-                wxMutexGuiLeave();
-                wxUsleep(20);
-                wxMutexGuiEnter();
-#endif
-            }
-        }
+    while (menu->GetId() == 1)
+    {
+        wxDoEventLoopIteration( evtLoop );

     }
     }

+

     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif
+

 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------


@@ -1352,9 +1345,9 @@ void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
             y = oldY;
     }
 
             y = oldY;
     }
 

-    if ( width == -1 )
+    if ( width <= 0 )

         width = oldW;
         width = oldW;

-    if ( height == -1 )
+    if ( height <= 0 )

         height = oldH;
 
     bool nothingChanged = (x == oldX) && (y == oldY) &&
         height = oldH;
 
     bool nothingChanged = (x == oldX) && (y == oldY) &&


@@ -1390,15 +1383,6 @@ void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
 
         if (managed)
             XtManageChild(widget);
 
         if (managed)
             XtManageChild(widget);

-
-        // How about this bit. Maybe we don't need to generate size events
-        // all the time -- they'll be generated when the window is sized anyway.
-#if 0
-        wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-        sizeEvent.SetEventObject(this);
-
-        GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0

     }
 }
 
     }
 }
 


@@ -1727,6 +1711,7 @@ void wxWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 {
 
 bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 {

+#if wxUSE_ACCEL

     if (!m_acceleratorTable.Ok())
         return FALSE;
 
     if (!m_acceleratorTable.Ok())
         return FALSE;
 


@@ -1753,6 +1738,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
             wxFrame* frame = wxDynamicCast(parent, wxFrame);
             if ( frame )
             {
             wxFrame* frame = wxDynamicCast(parent, wxFrame);
             if ( frame )
             {

+#if wxUSE_MENUS

                 // Try for a menu command
                 if (frame->GetMenuBar())
                 {
                 // Try for a menu command
                 if (frame->GetMenuBar())
                 {


@@ -1767,6 +1753,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
                         return frame->GetEventHandler()->ProcessEvent(commandEvent);
                     }
                 }
                         return frame->GetEventHandler()->ProcessEvent(commandEvent);
                     }
                 }

+#endif

             }
 
             // Find a child matching the command id
             }
 
             // Find a child matching the command id


@@ -1788,6 +1775,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
             return FALSE;
         } // matches event
     }// for
             return FALSE;
         } // matches event
     }// for

+#endif

 
     // We didn't match the key event against an accelerator.
     return FALSE;
 
     // We didn't match the key event against an accelerator.
     return FALSE;