ignore clicks on a toolbar but outside any button

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 30a1b00391f53ddfa7531582d4c41b8c47cda0e9..e51b353f980b61795fd9209a41ff9bc859bbc48d 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -713,7 +713,7 @@ wxString wxWindow::GetTitle() const
     return wxString(title);
 }
 
     return wxString(title);
 }
 

-void wxWindow::CaptureMouse()
+void wxWindow::DoCaptureMouse()

 {
     g_captureWindow = this;
     if ( m_winCaptured )
 {
     g_captureWindow = this;
     if ( m_winCaptured )


@@ -726,7 +726,7 @@ void wxWindow::CaptureMouse()
     m_winCaptured = TRUE;
 }
 
     m_winCaptured = TRUE;
 }
 

-void wxWindow::ReleaseMouse()
+void wxWindow::DoReleaseMouse()

 {
     g_captureWindow = NULL;
     if ( !m_winCaptured )
 {
     g_captureWindow = NULL;
     if ( !m_winCaptured )


@@ -1366,17 +1366,6 @@ wxPoint wxWindow::GetClientAreaOrigin() const
     return wxPoint(0, 0);
 }
 
     return wxPoint(0, 0);
 }
 

-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
-{
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-}
-

 void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
 {
     m_minWidth = minW;
 void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
 {
     m_minWidth = minW;


@@ -2147,12 +2136,13 @@ static void wxCanvasInputEvent(Widget drawingArea,
     case KeyPress:
         {
             KeySym keySym;
     case KeyPress:
         {
             KeySym keySym;

+            static char buf[100];

 #if 0
             XComposeStatus compose;
 #if 0
             XComposeStatus compose;

-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, &compose);
+            (void) XLookupString ((XKeyEvent *) & local_event, buf, 20, &keySym, &compose);

 #endif // 0
 
 #endif // 0
 

-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
+            (void) XLookupString ((XKeyEvent *) & local_event, buf, 20, &keySym, NULL);

             int id = wxCharCodeXToWX (keySym);
 
             wxEventType eventType = wxEVT_CHAR;
             int id = wxCharCodeXToWX (keySym);
 
             wxEventType eventType = wxEVT_CHAR;


@@ -2200,8 +2190,9 @@ static void wxCanvasInputEvent(Widget drawingArea,
         }
     case KeyRelease:
         {
         }
     case KeyRelease:
         {

+            static char buf[100];

             KeySym keySym;
             KeySym keySym;

-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
+            (void) XLookupString ((XKeyEvent *) & local_event, buf, 20, &keySym, NULL);

             int id = wxCharCodeXToWX (keySym);
 
             wxKeyEvent event (wxEVT_KEY_UP);
             int id = wxCharCodeXToWX (keySym);
 
             wxKeyEvent event (wxEVT_KEY_UP);