]> git.saurik.com Git - wxWidgets.git/blobdiff - src/motif/window.cpp
Added "set new icon" menu item to taskbar sample; updated some makefiles
[wxWidgets.git] / src / motif / window.cpp
index 3dd230e4e35f921c708bb6c1b7b9dd4100767238..ba7350acb3729372804f170208a9e5c44d147232 100644 (file)
     #pragma implementation "window.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN
+#endif
+
 #include "wx/setup.h"
 #include "wx/menu.h"
 #include "wx/dc.h"
@@ -44,6 +50,9 @@
     #include "wx/dnd.h"
 #endif
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
 
 #include <Xm/DrawingA.h>
@@ -52,6 +61,9 @@
 #include <Xm/Frame.h>
 #include <Xm/Label.h>
 #include <Xm/RowColumn.h>           // for XmMenuPosition
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include "wx/motif/private.h"
 
@@ -114,14 +126,12 @@ static int str16len(const char *s)
 // event tables
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 
     BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
         EVT_IDLE(wxWindow::OnIdle)
     END_EVENT_TABLE()
-#endif // USE_SHARED_LIBRARY
 
 // ============================================================================
 // implementation
@@ -404,10 +414,9 @@ wxWindow::~wxWindow()
         if (w)
         {
             XtDestroyWidget(w);
+           m_drawingArea = (WXWidget) 0;
         }
 
-        m_mainWidget = (WXWidget) 0;
-
         // Only if we're _really_ a canvas (not a dialog box/panel)
         if (m_scrolledWindow)
         {
@@ -417,14 +426,19 @@ wxWindow::~wxWindow()
         if (m_hScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_hScrollBar);
+           XtUnmanageChild((Widget) m_hScrollBar);
         }
         if (m_vScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_vScrollBar);
+           XtUnmanageChild((Widget) m_vScrollBar);
         }
 
-        UnmanageAndDestroy(m_hScrollBar);
-        UnmanageAndDestroy(m_vScrollBar);
+        if (m_hScrollBar)
+           XtDestroyWidget((Widget) m_hScrollBar);
+        if (m_vScrollBar)
+           XtDestroyWidget((Widget) m_vScrollBar);
+
         UnmanageAndDestroy(m_scrolledWindow);
 
         if (m_borderWidget)
@@ -433,6 +447,9 @@ wxWindow::~wxWindow()
             m_borderWidget = (WXWidget) 0;
         }
     }
+    else // Why wasn't this here before? JACS 8/3/2000
+        DestroyChildren();
+
 
     // Destroy the window
     if (GetMainWidget())
@@ -442,6 +459,12 @@ wxWindow::~wxWindow()
         // or dialog is destroyed, but before that you may get some memory
         // leaks and potential layout problems if you delete and then add
         // child windows.
+
+        // GRG, Feb/2000: commented this out when adding support for
+        //   wxSCROLL[WIN]_THUMBRELEASE events. Also it was reported
+        //   that this call crashed wxMotif under OS/2, so it seems
+        //   that leaving it out is the right thing to do.
+        // SN, Feb/2000: newgrid/griddemo shows why it is needed :-(
         XtDestroyWidget((Widget) GetMainWidget());
         SetMainWidget((WXWidget) NULL);
     }
@@ -465,7 +488,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
             XmNorientation, XmHORIZONTAL,
             NULL);
-        //      XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+        XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
         XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
         XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
         XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
@@ -501,7 +524,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
             XmNorientation, XmVERTICAL,
             NULL);
-        //      XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+        XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
         XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
         XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
         XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
@@ -563,7 +586,7 @@ void wxWindow::DestroyScrollbar(wxOrientation orientation)
             XtDestroyWidget((Widget) m_vScrollBar);
         }
         m_vScrollBar = (WXWidget) 0;
-        m_vScroll = TRUE;
+        m_vScroll = FALSE;
 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNverticalScrollBar, (Widget) 0,
@@ -730,11 +753,16 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
         return FALSE;
     }
 
-    wxASSERT_MSG( m_cursor.Ok(),
-                  wxT("cursor must be valid after call to the base version"));
+    //    wxASSERT_MSG( m_cursor.Ok(),
+    //                  wxT("cursor must be valid after call to the base version"));
+    wxCursor* cursor2 = NULL;
+    if (m_cursor.Ok())
+        cursor2 = & m_cursor;
+    else
+        cursor2 = wxSTANDARD_CURSOR;
 
     WXDisplay *dpy = GetXDisplay();
-    WXCursor x_cursor = m_cursor.GetXCursor(dpy);
+    WXCursor x_cursor = cursor2->GetXCursor(dpy);
 
     Widget w = (Widget) GetMainWidget();
     Window win = XtWindow(w);
@@ -1177,7 +1205,7 @@ void wxWindow::DoGetSize(int *x, int *y) const
     Widget widget = (Widget) GetTopWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    *x = xx; *y = yy;
+    if(x) *x = xx; if(y) *y = yy;
 }
 
 void wxWindow::DoGetPosition(int *x, int *y) const
@@ -1200,7 +1228,7 @@ void wxWindow::DoGetPosition(int *x, int *y) const
         yy -= pt.y;
     }
 
-    *x = xx; *y = yy;
+    if(x) *x = xx; if(y) *y = yy;
 }
 
 void wxWindow::DoScreenToClient(int *x, int *y) const
@@ -1236,7 +1264,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
     Widget widget = (Widget) GetClientWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    *x = xx; *y = yy;
+    if(x) *x = xx; if(y) *y = yy;
 }
 
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
@@ -1246,69 +1274,61 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     GetSize(& oldW, & oldH);
     GetPosition(& oldX, & oldY);
 
-    bool useOldPos = FALSE;
-    bool useOldSize = FALSE;
+    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    {
+        if ( x == -1 )
+            x = oldX;
+        if ( y == -1 )
+            y = oldY;
+    }
 
-    if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
-        useOldPos = TRUE;
-    else if (x == oldX && y == oldY)
-        useOldPos = TRUE;
+    if ( width == -1 )
+        width = oldW;
+    if ( height == -1 )
+        height = oldH;
 
-    if ((width == -1) && (height == -1))
-        useOldSize = TRUE;
-    else if (width == oldW && height == oldH)
-        useOldSize = TRUE;
+    bool nothingChanged = (x == oldX) && (y == oldY) &&
+                          (width == oldW) && (height == oldH);
 
     if (!wxNoOptimize::CanOptimize())
     {
-        useOldSize = FALSE; useOldPos = FALSE;
+        nothingChanged = FALSE;
     }
 
-    if (useOldPos && useOldSize)
-        return;
-
-    if (m_drawingArea)
+    if ( !nothingChanged )
     {
-        CanvasSetSize(x, y, width, height, sizeFlags);
-        return;
-    }
-    Widget widget = (Widget) GetTopWidget();
-    if (!widget)
-        return;
+        if (m_drawingArea)
+        {
+            CanvasSetSize(x, y, width, height, sizeFlags);
+            return;
+        }
 
-    bool managed = XtIsManaged( widget );
-    if (managed)
-        XtUnmanageChild(widget);
+        Widget widget = (Widget) GetTopWidget();
+        if (!widget)
+            return;
 
-    int xx = x; int yy = y;
-    AdjustForParentClientOrigin(xx, yy, sizeFlags);
+        bool managed = XtIsManaged( widget );
+        if (managed)
+            XtUnmanageChild(widget);
 
-    if (!useOldPos)
-    {
-        if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-            XtVaSetValues(widget, XmNx, xx, NULL);
-        if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-            XtVaSetValues(widget, XmNy, yy, NULL);
-    }
-    if (!useOldSize)
-    {
-        if (width > -1)
-            XtVaSetValues(widget, XmNwidth, width, NULL);
-        if (height > -1)
-            XtVaSetValues(widget, XmNheight, height, NULL);
-    }
+        int xx = x;
+        int yy = y;
+        AdjustForParentClientOrigin(xx, yy, sizeFlags);
 
-    if (managed)
-        XtManageChild(widget);
+        DoMoveWindow(xx, yy, width, height);
 
-    // 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 (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);
+        wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+        sizeEvent.SetEventObject(this);
 
-      GetEventHandler()->ProcessEvent(sizeEvent);
+        GetEventHandler()->ProcessEvent(sizeEvent);
 #endif // 0
+    }
 }
 
 void wxWindow::DoSetClientSize(int width, int height)
@@ -1380,6 +1400,16 @@ void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, in
         XtVaSetValues(widget, XmNheightInc, incH, NULL);
 }
 
+void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+{
+    XtVaSetValues((Widget)GetTopWidget(),
+                  XmNx, x,
+                  XmNy, y,
+                  XmNwidth, width,
+                  XmNheight, height,
+                  NULL);
+}
+
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
@@ -1714,7 +1744,7 @@ bool wxAddWindowToTable(Widget w, wxWindow *win)
 
     wxWidgetHashTable->Put((long) w, win);
 
-    wxLogDebug("Widget 0x%08x <-> window %p (%s)",
+    wxLogTrace("widget", "Widget 0x%08x <-> window %p (%s)",
                w, win, win->GetClassInfo()->GetClassName());
 
     return TRUE;
@@ -1968,22 +1998,6 @@ static void wxCanvasInputEvent(Widget drawingArea,
             else if (local_event.xany.type == MotionNotify)
             {
                 eventType = wxEVT_MOTION;
-                if (local_event.xmotion.is_hint == NotifyHint)
-                {
-                    Window root, child;
-                    Display *dpy = XtDisplay (drawingArea);
-
-                    XQueryPointer (dpy, XtWindow (drawingArea),
-                        &root, &child,
-                        &local_event.xmotion.x_root,
-                        &local_event.xmotion.y_root,
-                        &local_event.xmotion.x,
-                        &local_event.xmotion.y,
-                        &local_event.xmotion.state);
-                }
-                else
-                {
-                }
             }
 
             else if (local_event.xany.type == ButtonPress)
@@ -2041,6 +2055,26 @@ static void wxCanvasInputEvent(Widget drawingArea,
             wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
             wxevent.SetTimestamp(local_event.xbutton.time);
 
+           if ( eventType == wxEVT_MOTION )
+           {
+                if (local_event.xmotion.is_hint == NotifyHint)
+                {
+                    Window root, child;
+                    Display *dpy = XtDisplay (drawingArea);
+
+                    XQueryPointer (dpy, XtWindow (drawingArea),
+                        &root, &child,
+                        &local_event.xmotion.x_root,
+                        &local_event.xmotion.y_root,
+                        &local_event.xmotion.x,
+                        &local_event.xmotion.y,
+                        &local_event.xmotion.state);
+                }
+                else
+                {
+                }
+           }
+
             // Now check if we need to translate this event into a double click
             if (TRUE) // canvas->doubleClickAllowed)
             {
@@ -2065,22 +2099,21 @@ static void wxCanvasInputEvent(Widget drawingArea,
                     {
                         // I have a dclick
                         canvas->SetLastClick(0, ts);
-                        switch ( eventType )
+
+                        wxEventType typeDouble;
+                        if ( eventType == wxEVT_LEFT_DOWN )
+                            typeDouble = wxEVT_LEFT_DCLICK;
+                        else if ( eventType == wxEVT_MIDDLE_DOWN )
+                            typeDouble = wxEVT_MIDDLE_DCLICK;
+                        else if ( eventType == wxEVT_RIGHT_DOWN )
+                            typeDouble = wxEVT_RIGHT_DCLICK;
+                        else
+                            typeDouble = wxEVT_NULL;
+
+                        if ( typeDouble != wxEVT_NULL )
                         {
-                        case wxEVT_LEFT_DOWN:
-                            wxevent.SetEventType(wxEVT_LEFT_DCLICK);
-                            break;
-                        case wxEVT_MIDDLE_DOWN:
-                            wxevent.SetEventType(wxEVT_MIDDLE_DCLICK);
-                            break;
-                        case wxEVT_RIGHT_DOWN:
-                            wxevent.SetEventType(wxEVT_RIGHT_DCLICK);
-                            break;
-
-                        default :
-                            break;
+                            wxevent.SetEventType(typeDouble);
                         }
-
                     }
                     else
                     {
@@ -2263,9 +2296,7 @@ static void wxScrollBarCallback(Widget scrollbar,
         }
     case XmCR_VALUE_CHANGED:
         {
-            // TODO: Should this be intercepted too, or will it cause
-            // duplicate events?
-            eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+            eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
             break;
         }
     case XmCR_PAGE_INCREMENT:
@@ -2624,22 +2655,12 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                 {
                     // I have a dclick
                     win->SetLastClick(0, ts);
-                    switch ( eventType )
-                    {
-                        case wxEVT_LEFT_DOWN:
-                            eventType = wxEVT_LEFT_DCLICK;
-                            break;
-                        case wxEVT_MIDDLE_DOWN:
-                            eventType = wxEVT_MIDDLE_DCLICK;
-                            break;
-                        case wxEVT_RIGHT_DOWN:
-                            eventType = wxEVT_RIGHT_DCLICK;
-                            break;
-
-                        default :
-                            break;
-                    }
-                    
+                    if ( eventType == wxEVT_LEFT_DOWN )
+                        eventType = wxEVT_LEFT_DCLICK;
+                    else if ( eventType == wxEVT_MIDDLE_DOWN )
+                        eventType = wxEVT_MIDDLE_DCLICK;
+                    else if ( eventType == wxEVT_RIGHT_DOWN )
+                        eventType = wxEVT_RIGHT_DCLICK;
                 }
                 else
                 {
@@ -2952,9 +2973,34 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
 wxWindow *wxGetActiveWindow()
 {
     // TODO
+    wxFAIL_MSG("Not implemented");
     return NULL;
 }
 
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+{
+    return wxFindWindowAtPoint(wxGetMousePosition());
+}
+
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    Display *display = (Display*) wxGetDisplay();
+    Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
+    Window rootReturn, childReturn;
+    int rootX, rootY, winX, winY;
+    unsigned int maskReturn;
+
+    XQueryPointer (display,
+                  rootWindow,
+                  &rootReturn,
+                   &childReturn,
+                   &rootX, &rootY, &winX, &winY, &maskReturn);
+    return wxPoint(rootX, rootY);
+}
+
 // ----------------------------------------------------------------------------
 // wxNoOptimize: switch off size optimization
 // ----------------------------------------------------------------------------