X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af111fc33841cc8bdc4d6cf027702805333bdd2a..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/motif/window.cpp

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index eb96d7f645..3dd230e4e3 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -40,8 +40,6 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
-#include "wx/listimpl.cpp"
-
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
@@ -129,12 +127,6 @@ static int str16len(const char *s)
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// list types
-// ----------------------------------------------------------------------------
-
-WX_DEFINE_LIST(wxRectList);
-
 // ----------------------------------------------------------------------------
 // helper functions
 // ----------------------------------------------------------------------------
@@ -253,7 +245,18 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
-    if (style & wxBORDER)
+    
+    if (style & wxSIMPLE_BORDER)
+    {
+        m_borderWidget = (WXWidget)XtVaCreateManagedWidget
+                                   (
+                                    "canvasBorder",
+                                    xmFrameWidgetClass, parentWidget,
+                                    XmNshadowType, XmSHADOW_IN,
+                                    XmNshadowThickness, 1,
+                                    NULL
+                                   );
+    } else if (style & wxSUNKEN_BORDER)
     {
         m_borderWidget = (WXWidget)XtVaCreateManagedWidget
                                    (
@@ -262,6 +265,15 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
                                     XmNshadowType, XmSHADOW_IN,
                                     NULL
                                    );
+    } else if (style & wxRAISED_BORDER)
+    {
+        m_borderWidget = (WXWidget)XtVaCreateManagedWidget
+                                   (
+                                    "canvasBorder",
+                                    xmFrameWidgetClass, parentWidget,
+                                    XmNshadowType, XmSHADOW_OUT,
+                                    NULL
+                                   );
     }
 
     m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget
@@ -888,6 +900,18 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
         GetClientSize(& w, & h);
     }
 
+    wxNode *cnode = m_children.First();
+    while (cnode)
+    {
+        wxWindow *child = (wxWindow*) cnode->Data();
+	int sx = 0;
+	int sy = 0;
+	child->GetSize( &sx, &sy );
+        wxPoint pos( child->GetPosition() );
+	child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
+	cnode = cnode->Next();
+    }
+
     int x1 = (dx >= 0) ? x : x - dx;
     int y1 = (dy >= 0) ? y : y - dy;
     int w1 = w - abs(dx);
@@ -1633,7 +1657,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
                 // Try for a menu command
                 if (frame->GetMenuBar())
                 {
-                    wxMenuItem* item = frame->GetMenuBar()->FindItemForId(entry->GetCommand());
+                    wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
                     if (item)
                     {
                         wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());